Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Spree 2.1] Re-add spring and newrelic_rpm #5044

Merged
merged 1 commit into from
Mar 26, 2020
+10 −3
Merged

[Spree 2.1] Re-add spring and newrelic_rpm #5044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,12 @@ end
group :development do
gem 'byebug', '~> 9.0.0' # 9.1 requires ruby 2.2
gem 'debugger-linecache'
#gem "newrelic_rpm", "~> 3.0"
gem "newrelic_rpm", "~> 3.0"
gem 'pry-byebug', '>= 3.4.3'
gem 'rubocop'
gem 'rubocop-rails'
#gem 'spring'
#gem 'spring-commands-rspec'
gem 'spring'
gem 'spring-commands-rspec'

# 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
# While we don't require this gem directly, no dependents forced the upgrade to a version
Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ GEM
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
newrelic_rpm (3.18.1.330)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
oauth2 (1.4.4)
Expand Down Expand Up @@ -631,6 +632,9 @@ GEM
tilt (>= 1.3, < 3)
spinjs-rails (1.4)
rails (>= 3.1)
spring (1.7.2)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
Expand Down Expand Up @@ -742,6 +746,7 @@ DEPENDENCIES
letter_opener (>= 1.4.1)
mini_racer (= 0.2.9)
momentjs-rails
newrelic_rpm (~> 3.0)
nokogiri (~> 1.6.8.1)
oauth2 (~> 1.4.4)
ofn-qz!
Expand Down Expand Up @@ -775,6 +780,8 @@ DEPENDENCIES
spree_core!
spree_i18n!
spree_paypal_express!
spring
spring-commands-rspec
stripe
test-unit (~> 3.3)
timecop
Expand Down