Skip to content

Commit

Permalink
Merge pull request #538 from CloCkWeRX/upgrade_misc_gems_jan_2017
Browse files Browse the repository at this point in the history
Upgrade gems - Jan 2017 edition
  • Loading branch information
CloCkWeRX committed Jan 10, 2017
2 parents 2906f2e + 54466f1 commit 0652059
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -63,7 +63,7 @@ group :development, :test do
gem 'headless'
gem 'byebug'
gem 'pry-rails' unless ENV["CI"]
gem 'factory_girl_rails'
gem 'factory_girl_rails', '~> 4.7.0' # 4.8.0+ stubbed models are not allowed to access the database - User#destroyed?()
end

group :test do
Expand Down
48 changes: 24 additions & 24 deletions Gemfile.lock
Expand Up @@ -46,9 +46,9 @@ GEM
activerecord (>= 3.0)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
airbrussh (1.1.1)
airbrussh (1.1.2)
sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.3)
arel (6.0.4)
authlogic (3.4.6)
activerecord (>= 3.2)
activesupport (>= 3.2)
Expand All @@ -57,7 +57,7 @@ GEM
builder (3.2.2)
byebug (9.0.6)
cancancan (1.15.0)
capistrano (3.6.1)
capistrano (3.7.1)
airbrussh (>= 1.0.0)
capistrano-harrow
i18n
Expand All @@ -67,13 +67,13 @@ GEM
capistrano (~> 3.1)
sshkit (~> 1.2)
capistrano-harrow (0.5.3)
capistrano-rails (1.2.0)
capistrano-rails (1.2.1)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capybara (2.10.2)
capybara (2.11.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -95,8 +95,8 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.8.0)
concurrent-ruby (1.0.2)
countries (2.0.4)
concurrent-ruby (1.0.4)
countries (2.0.5)
i18n_data (~> 0.7.0)
money (~> 6.7)
unicode_utils (~> 1.4)
Expand All @@ -118,7 +118,7 @@ GEM
factory_girl_rails (4.7.0)
factory_girl (~> 4.7.0)
railties (>= 3.0.0)
ffaker (2.3.0)
ffaker (2.4.0)
ffi (1.9.14)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
Expand Down Expand Up @@ -152,22 +152,22 @@ GEM
i18n (0.7.0)
i18n_data (0.7.0)
jquery-migrate-rails (1.2.1)
jquery-rails (4.2.1)
jquery-rails (4.2.2)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (1.8.3)
kgio (2.10.0)
kgio (2.11.0)
libv8 (3.16.14.17)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.10)
lumberjack (1.0.11)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
Expand All @@ -177,19 +177,19 @@ GEM
mimemagic (0.3.2)
mini_portile2 (2.1.0)
minitest (5.10.1)
money (6.7.1)
money (6.8.1)
i18n (>= 0.6.4, <= 0.7.0)
sixarm_ruby_unaccent (>= 1.1.1, < 2)
nenv (0.3.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
net-ssh (4.0.1)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
paper_trail (6.0.1)
paper_trail (6.0.2)
activerecord (>= 4.0, < 5.2)
request_store (~> 1.1)
paperclip (5.1.0)
Expand All @@ -210,7 +210,7 @@ GEM
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
public_suffix (2.0.4)
public_suffix (2.0.5)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.5)
Expand Down Expand Up @@ -270,7 +270,7 @@ GEM
rb-inotify (0.9.7)
ffi (>= 0.5.0)
ref (2.0.0)
request_store (1.3.1)
request_store (1.3.2)
responders (2.1.1)
railties (>= 4.2.0, < 5.1)
responds_to_parent (1.1.0)
Expand Down Expand Up @@ -301,7 +301,7 @@ GEM
rspec-support (3.5.0)
ruby_dep (1.5.0)
rubyzip (1.2.0)
sass (3.4.22)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand All @@ -325,19 +325,19 @@ GEM
slop (3.6.0)
sort_alphabetical (1.1.0)
unicode_utils (>= 1.2.2)
sprockets (3.7.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.12)
sshkit (1.11.4)
sqlite3 (1.3.13)
sshkit (1.11.5)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thin (1.7.0)
daemons (~> 1.0, >= 1.0.9)
Expand All @@ -360,7 +360,7 @@ GEM
will_paginate (3.1.5)
xpath (2.0.0)
nokogiri (~> 1.3)
zeus (0.15.10)
zeus (0.15.12)
method_source (>= 0.6.7)

PLATFORMS
Expand All @@ -387,7 +387,7 @@ DEPENDENCIES
dynamic_form
email_reply_parser_ffcrm
execjs
factory_girl_rails
factory_girl_rails (~> 4.7.0)
ffaker (>= 2)
font-awesome-rails
guard
Expand Down

0 comments on commit 0652059

Please sign in to comment.