consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1509 from consul/update-gems

Browse Source 
Update gems
This commit is contained in:
Raimond Garcia
2017-05-02 13:38:43 +02:00
committed by GitHub
parent 453dd2e8a7 f80019aa1f
commit d0289f58a6
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Gemfile
View File

@@ -34,7 +34,7 @@ gem 'omniauth-google-oauth2', '~> 0.4.0'
gem 'kaminari', '~> 1.0.1' gem 'kaminari', '~> 1.0.1'
gem 'ancestry', '~> 2.2.2' gem 'ancestry', '~> 2.2.2'
gem 'acts-as-taggable-on' gem 'acts-as-taggable-on'
gem 'responders', '~> 2.3.0' gem 'responders', '~> 2.4.0'
gem 'foundation-rails', '~> 6.2.4.0' gem 'foundation-rails', '~> 6.2.4.0'
gem 'foundation_rails_helper', '~> 2.0.0' gem 'foundation_rails_helper', '~> 2.0.0'
gem 'acts_as_votable' gem 'acts_as_votable'
@@ -44,7 +44,7 @@ gem 'cancancan', '~> 1.16.0'
gem 'social-share-button', '~> 0.10' gem 'social-share-button', '~> 0.10'
gem 'initialjs-rails', '0.2.0.4' gem 'initialjs-rails', '0.2.0.4'
gem 'unicorn', '~> 5.3.0' gem 'unicorn', '~> 5.3.0'
gem 'paranoia', '~> 2.3.0' gem 'paranoia', '~> 2.3.1'
gem 'rinku', '~> 2.0.2', require: 'rails_rinku' gem 'rinku', '~> 2.0.2', require: 'rails_rinku'
gem 'savon' gem 'savon'
gem 'dalli' gem 'dalli'
@@ -57,7 +57,7 @@ gem 'whenever', require: false
gem 'pg_search' gem 'pg_search'
gem 'sitemap_generator', '~> 5.3.1' gem 'sitemap_generator', '~> 5.3.1'
gem 'ahoy_matey', '~> 1.5.5' gem 'ahoy_matey', '~> 1.6.0'
gem 'groupdate', '~> 3.2.0' # group temporary data gem 'groupdate', '~> 3.2.0' # group temporary data
gem 'tolk', '~> 2.0.0' # Web interface for translations gem 'tolk', '~> 2.0.0' # Web interface for translations
@@ -81,7 +81,7 @@ group :development, :test do
gem 'quiet_assets' gem 'quiet_assets'
gem 'letter_opener_web', '~> 1.3.1' gem 'letter_opener_web', '~> 1.3.1'
gem 'i18n-tasks', '~> 0.9.13' gem 'i18n-tasks', '~> 0.9.13'
gem 'capistrano', '~> 3.8.0', require: false gem 'capistrano', '~> 3.8.1', require: false
gem 'capistrano-bundler', '~> 1.2', require: false gem 'capistrano-bundler', '~> 1.2', require: false
gem "capistrano-rails", '~> 1.2.3', require: false gem "capistrano-rails", '~> 1.2.3', require: false
gem 'rvm1-capistrano3', require: false gem 'rvm1-capistrano3', require: false
@@ -95,7 +95,7 @@ end
group :test do group :test do
gem 'database_cleaner' gem 'database_cleaner'
gem 'poltergeist', '~> 1.14.0' gem 'poltergeist', '~> 1.14.0'
gem 'coveralls', '~> 0.8.20', require: false gem 'coveralls', '~> 0.8.21', require: false
gem 'email_spec' gem 'email_spec'
end end

33
Gemfile.lock
View File

@@ -40,7 +40,7 @@ GEM
acts_as_votable (0.10.0) acts_as_votable (0.10.0)
addressable (2.5.0) addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2) public_suffix (~> 2.0, >= 2.0.2)
ahoy_matey (1.5.5) ahoy_matey (1.6.0)
addressable addressable
browser (~> 2.0) browser (~> 2.0)
geocoder geocoder
@@ -51,7 +51,7 @@ GEM
safely_block (>= 0.1.1) safely_block (>= 0.1.1)
user_agent_parser user_agent_parser
uuidtools uuidtools
airbrussh (1.1.2) airbrussh (1.2.0)
sshkit (>= 1.6.1, != 1.7.0) sshkit (>= 1.6.1, != 1.7.0)
akami (1.3.1) akami (1.3.1)
gyoku (>= 0.4.0) gyoku (>= 0.4.0)
@@ -72,7 +72,7 @@ GEM
uniform_notifier (~> 1.10.0) uniform_notifier (~> 1.10.0)
byebug (9.0.6) byebug (9.0.6)
cancancan (1.16.0) cancancan (1.16.0)
capistrano (3.8.0) capistrano (3.8.1)
airbrussh (>= 1.0.0) airbrussh (>= 1.0.0)
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
@@ -110,7 +110,7 @@ GEM
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
coveralls (0.8.20) coveralls (0.8.21)
json (>= 1.8, < 3) json (>= 1.8, < 3)
simplecov (~> 0.14.1) simplecov (~> 0.14.1)
term-ansicolor (~> 1.3) term-ansicolor (~> 1.3)
@@ -205,7 +205,7 @@ GEM
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (2.0.4) json (2.1.0)
jwt (1.5.6) jwt (1.5.6)
kaminari (1.0.1) kaminari (1.0.1)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
@@ -284,8 +284,8 @@ GEM
cocaine (~> 0.5.5) cocaine (~> 0.5.5)
mime-types mime-types
mimemagic (~> 0.3.0) mimemagic (~> 0.3.0)
paranoia (2.3.0) paranoia (2.3.1)
activerecord (>= 4.0, < 5.1) activerecord (>= 4.0, < 5.2)
parser (2.4.0.0) parser (2.4.0.0)
ast (~> 2.2) ast (~> 2.2)
pg (0.20.0) pg (0.20.0)
@@ -338,8 +338,9 @@ GEM
redcarpet (3.4.0) redcarpet (3.4.0)
referer-parser (0.3.0) referer-parser (0.3.0)
request_store (1.3.2) request_store (1.3.2)
responders (2.3.0) responders (2.4.0)
railties (>= 4.2.0, < 5.1) actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
rinku (2.0.2) rinku (2.0.2)
rollbar (2.14.1) rollbar (2.14.1)
multi_json multi_json
@@ -412,7 +413,7 @@ GEM
actionpack (>= 4.0) actionpack (>= 4.0)
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sshkit (1.12.0) sshkit (1.13.1)
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
term-ansicolor (1.6.0) term-ansicolor (1.6.0)
@@ -435,7 +436,7 @@ GEM
rack (>= 1.3, < 3) rack (>= 1.3, < 3)
rack-accept (~> 0.4) rack-accept (~> 0.4)
tilt (>= 1.4, < 3) tilt (>= 1.4, < 3)
tzinfo (1.2.2) tzinfo (1.2.3)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (3.2.0) uglifier (3.2.0)
execjs (>= 0.3.0, < 3) execjs (>= 0.3.0, < 3)
@@ -469,20 +470,20 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
acts-as-taggable-on acts-as-taggable-on
acts_as_votable acts_as_votable
ahoy_matey (~> 1.5.5) ahoy_matey (~> 1.6.0)
ancestry (~> 2.2.2) ancestry (~> 2.2.2)
browser browser
bullet (~> 5.5.1) bullet (~> 5.5.1)
byebug byebug
cancancan (~> 1.16.0) cancancan (~> 1.16.0)
capistrano (~> 3.8.0) capistrano (~> 3.8.1)
capistrano-bundler (~> 1.2) capistrano-bundler (~> 1.2)
capistrano-rails (~> 1.2.3) capistrano-rails (~> 1.2.3)
capistrano3-delayed-job (~> 1.7.3) capistrano3-delayed-job (~> 1.7.3)
capybara (~> 2.13.0) capybara (~> 2.13.0)
ckeditor (~> 4.2.2) ckeditor (~> 4.2.2)
coffee-rails (~> 4.2.1) coffee-rails (~> 4.2.1)
coveralls (~> 0.8.20) coveralls (~> 0.8.21)
daemons daemons
dalli dalli
database_cleaner database_cleaner
@@ -512,14 +513,14 @@ DEPENDENCIES
omniauth-google-oauth2 (~> 0.4.0) omniauth-google-oauth2 (~> 0.4.0)
omniauth-twitter omniauth-twitter
paperclip paperclip
paranoia (~> 2.3.0) paranoia (~> 2.3.1)
pg (~> 0.20.0) pg (~> 0.20.0)
pg_search pg_search
poltergeist (~> 1.14.0) poltergeist (~> 1.14.0)
quiet_assets quiet_assets
rails (= 4.2.8) rails (= 4.2.8)
redcarpet (~> 3.4.0) redcarpet (~> 3.4.0)
responders (~> 2.3.0) responders (~> 2.4.0)
rinku (~> 2.0.2) rinku (~> 2.0.2)
rollbar (~> 2.14.1) rollbar (~> 2.14.1)
rspec-rails (~> 3.5) rspec-rails (~> 3.5)

2
config/deploy.rb
View File

@@ -1,5 +1,5 @@
# config valid only for current version of Capistrano # config valid only for current version of Capistrano
lock '3.8.0' lock '3.8.1'
def deploysecret(key) def deploysecret(key)
@deploy_secrets_yml ||= YAML.load_file('config/deploy-secrets.yml')[fetch(:stage).to_s] @deploy_secrets_yml ||= YAML.load_file('config/deploy-secrets.yml')[fetch(:stage).to_s]