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

Jump to bottom

Bump actionpack from 4.1.9 to 4.1.16 #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump actionpack from 4.1.9 to 4.1.16 #6

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
223 changes: 111 additions & 112 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
GIT
remote: git://github.com/spree/spree.git
revision: f8f760cb0d1f46d6a2b8aac452b3d7689e0a15f0
remote: https://github.com/spree/spree.git
revision: d0f34abce5950c103c5fe9d26611d53371a63d1d
branch: 2-4-stable
specs:
spree (2.4.7.beta)
spree_api (= 2.4.7.beta)
spree_backend (= 2.4.7.beta)
spree_cmd (= 2.4.7.beta)
spree_core (= 2.4.7.beta)
spree_frontend (= 2.4.7.beta)
spree_sample (= 2.4.7.beta)
spree_api (2.4.7.beta)
spree (2.4.11.beta)
spree_api (= 2.4.11.beta)
spree_backend (= 2.4.11.beta)
spree_cmd (= 2.4.11.beta)
spree_core (= 2.4.11.beta)
spree_frontend (= 2.4.11.beta)
spree_sample (= 2.4.11.beta)
spree_api (2.4.11.beta)
rabl (~> 0.9.4.pre1)
spree_core (= 2.4.7.beta)
spree_core (= 2.4.11.beta)
versioncake (~> 2.3.1)
spree_backend (2.4.7.beta)
spree_backend (2.4.11.beta)
jquery-rails (~> 3.1.2)
jquery-ui-rails (~> 5.0.0)
select2-rails (= 3.5.9.1)
spree_api (= 2.4.7.beta)
spree_core (= 2.4.7.beta)
spree_cmd (2.4.7.beta)
spree_api (= 2.4.11.beta)
spree_core (= 2.4.11.beta)
spree_cmd (2.4.11.beta)
thor (~> 0.14)
spree_core (2.4.7.beta)
spree_core (2.4.11.beta)
activemerchant (~> 1.44.1)
acts_as_list (~> 0.3)
awesome_nested_set (~> 3.0.1)
Expand All @@ -33,34 +33,33 @@ GIT
font-awesome-rails (~> 4.0)
friendly_id (~> 5.0.4)
highline (~> 1.6.18)
httparty (~> 0.11)
json (~> 1.7)
kaminari (~> 0.15, >= 0.15.1)
monetize (~> 1.1)
paperclip (~> 4.2.0)
paranoia (~> 2.0.5)
paranoia (~> 2.1.0)
premailer-rails
rails (= 4.1.9)
rails (~> 4.1.11)
ransack (~> 1.4.1)
state_machine (= 1.2.0)
stringex (~> 1.5.1)
truncate_html (= 0.9.2)
twitter_cldr (~> 3.0)
spree_frontend (2.4.7.beta)
spree_frontend (2.4.11.beta)
canonical-rails (~> 0.0.4)
jquery-rails (~> 3.1.2)
spree_api (= 2.4.7.beta)
spree_core (= 2.4.7.beta)
spree_sample (2.4.7.beta)
spree_core (= 2.4.7.beta)
spree_api (= 2.4.11.beta)
spree_core (= 2.4.11.beta)
spree_sample (2.4.11.beta)
spree_core (= 2.4.11.beta)

GIT
remote: git://github.com/spree/spree_auth_devise.git
revision: 590d36810bbd35905ee204b4c9ea6f03ff236d09
remote: https://github.com/spree/spree_auth_devise.git
revision: 5a3857f8745736de6a7d4030c4a2c0493a3eb574
branch: 2-4-stable
specs:
spree_auth_devise (2.2.0)
devise (~> 3.2.3)
spree_auth_devise (2.4.0)
devise (~> 3.5.4)
devise-encryptable (= 0.1.2)
json
multi_json
Expand All @@ -76,17 +75,17 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
actionmailer (4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.9)
actionview (= 4.1.9)
activesupport (= 4.1.9)
actionpack (4.1.16)
actionview (= 4.1.16)
activesupport (= 4.1.16)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.9)
activesupport (= 4.1.9)
actionview (4.1.16)
activesupport (= 4.1.16)
builder (~> 3.1)
erubis (~> 2.7.0)
active_utils (2.2.3)
Expand All @@ -100,30 +99,30 @@ GEM
json (~> 1.7)
nokogiri (~> 1.4)
offsite_payments (~> 2.0.0)
activemodel (4.1.9)
activesupport (= 4.1.9)
activemodel (4.1.16)
activesupport (= 4.1.16)
builder (~> 3.1)
activerecord (4.1.9)
activemodel (= 4.1.9)
activesupport (= 4.1.9)
activerecord (4.1.16)
activemodel (= 4.1.16)
activesupport (= 4.1.16)
arel (~> 5.0.0)
activesupport (4.1.9)
activesupport (4.1.16)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
acts_as_list (0.6.0)
acts_as_list (0.9.19)
activerecord (>= 3.0)
addressable (2.3.8)
addressable (2.4.0)
arel (5.0.1.20140414130214)
awesome_nested_set (3.0.2)
awesome_nested_set (3.0.3)
activerecord (>= 4.0.0, < 5)
bcrypt (3.1.10)
builder (3.2.2)
camertron-eprun (1.1.0)
bcrypt (3.1.18)
builder (3.2.4)
camertron-eprun (1.1.1)
cancancan (1.9.2)
canonical-rails (0.0.9)
canonical-rails (0.0.11)
rails (>= 3.1, < 5.0)
capybara (2.4.4)
mime-types (>= 1.16)
Expand All @@ -135,10 +134,9 @@ GEM
activesupport (>= 3.0.0)
childprocess (0.5.6)
ffi (~> 1.0, >= 1.0.11)
cldr-plurals-runtime-rb (1.0.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.7)
cldr-plurals-runtime-rb (1.1.0)
climate_control (0.2.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
codeclimate-test-reporter (0.4.7)
simplecov (>= 0.7.1, < 1.0.0)
Expand All @@ -149,19 +147,21 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1)
colorize (0.7.5)
css_parser (1.3.6)
colorize (0.8.1)
concurrent-ruby (1.1.9)
css_parser (1.7.1)
addressable
database_cleaner (1.4.1)
deface (1.0.1)
deface (1.0.2)
colorize (>= 0.5.8)
nokogiri (~> 1.6.0)
polyglot
rails (>= 3.1)
devise (3.2.4)
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
devise-encryptable (0.1.2)
Expand All @@ -174,41 +174,39 @@ GEM
activesupport (>= 3.0.0)
ffaker (1.32.1)
ffi (1.9.8)
font-awesome-rails (4.3.0.0)
railties (>= 3.2, < 5.0)
font-awesome-rails (4.7.0.8)
railties (>= 3.2, < 8.0)
friendly_id (5.0.5)
activerecord (>= 4.0.0)
haml (4.0.6)
tilt
highline (1.6.21)
hike (1.2.3)
htmlentities (4.3.3)
httparty (0.13.3)
json (~> 1.8)
multi_xml (>= 0.5.2)
i18n (0.7.0)
jquery-rails (3.1.2)
htmlentities (4.3.4)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (3.1.5)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.3)
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.2)
kaminari (0.16.3)
json (1.8.6)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.4.3)
mini_portile (0.6.2)
minitest (5.5.1)
monetize (1.2.0)
money (~> 6.5.0)
money (6.5.1)
i18n (>= 0.6.4, <= 0.7.0)
multi_json (1.11.0)
multi_xml (0.5.5)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
mime-types (2.99.3)
mini_mime (1.1.2)
mini_portile2 (2.1.0)
minitest (5.12.0)
monetize (1.12.0)
money (~> 6.12)
money (6.16.0)
i18n (>= 0.6.4, <= 2)
multi_json (1.15.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
offsite_payments (2.0.1)
active_utils (~> 2.2.0)
activesupport (>= 3.2.14, < 5.0.0)
Expand All @@ -218,49 +216,51 @@ GEM
money (< 7.0.0)
nokogiri (~> 1.4)
orm_adapter (0.5.0)
paperclip (4.2.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
paperclip (4.2.4)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
paranoia (2.0.5)
paranoia (2.1.5)
activerecord (~> 4.0)
polyamorous (1.2.0)
polyamorous (1.3.3)
activerecord (>= 3.0)
polyglot (0.3.5)
premailer (1.8.4)
premailer (1.8.6)
css_parser (>= 1.3.6)
htmlentities (>= 4.0.0)
premailer-rails (1.8.0)
actionmailer (>= 3, < 5)
premailer-rails (1.11.1)
actionmailer (>= 3)
premailer (~> 1.7, >= 1.7.9)
rabl (0.9.4.pre1)
activesupport (>= 2.3.14)
rack (1.5.2)
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.1.9)
actionmailer (= 4.1.9)
actionpack (= 4.1.9)
actionview (= 4.1.9)
activemodel (= 4.1.9)
activerecord (= 4.1.9)
activesupport (= 4.1.9)
rails (4.1.16)
actionmailer (= 4.1.16)
actionpack (= 4.1.16)
actionview (= 4.1.16)
activemodel (= 4.1.16)
activerecord (= 4.1.16)
activesupport (= 4.1.16)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.9)
railties (= 4.1.16)
sprockets-rails (~> 2.0)
railties (4.1.9)
actionpack (= 4.1.9)
activesupport (= 4.1.9)
railties (4.1.16)
actionpack (= 4.1.16)
activesupport (= 4.1.16)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rake (12.2.1)
ransack (1.4.1)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.1)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rspec-core (3.2.3)
rspec-support (~> 3.2.0)
rspec-expectations (3.2.1)
Expand Down Expand Up @@ -297,35 +297,34 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.9.0)
simplecov-html (0.9.0)
sprockets (2.12.3)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
state_machine (1.2.0)
stringex (1.5.1)
thor (0.19.1)
thread_safe (0.3.5)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
truncate_html (0.9.2)
twitter_cldr (3.1.2)
twitter_cldr (3.6.0)
camertron-eprun
cldr-plurals-runtime-rb (~> 1.0.0)
json
cldr-plurals-runtime-rb (~> 1.0)
tzinfo
tzinfo (1.2.2)
tzinfo (1.2.10)
thread_safe (~> 0.1)
versioncake (2.3.1)
actionpack (>= 3.2)
activesupport (>= 3.2)
railties (>= 3.2)
tzinfo
warden (1.2.3)
warden (1.2.7)
rack (>= 1.0)
websocket (1.2.1)
xpath (2.0.0)
Expand Down