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

Merge pull request #1272 from consul/update-gems

Browse Source 
Update gems
This commit is contained in:
Juanjo Bazán
2016-11-22 13:14:19 +01:00
committed by GitHub
parent ae2a6d6498 619c77f615
commit 4782332691
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -32,7 +32,7 @@ gem 'omniauth-facebook', '~> 3.0.0'
gem 'omniauth-google-oauth2', '~> 0.4.0' gem 'omniauth-google-oauth2', '~> 0.4.0'
gem 'kaminari' gem 'kaminari'
gem 'ancestry', '~> 2.2.1' gem 'ancestry', '~> 2.2.2'
gem 'acts-as-taggable-on' gem 'acts-as-taggable-on'
gem 'responders', '~> 2.3.0' gem 'responders', '~> 2.3.0'
gem 'foundation-rails', '~> 6.2.4.0' gem 'foundation-rails', '~> 6.2.4.0'

14
Gemfile.lock
View File

@@ -56,7 +56,7 @@ GEM
akami (1.3.1) akami (1.3.1)
gyoku (>= 0.4.0) gyoku (>= 0.4.0)
nokogiri nokogiri
ancestry (2.2.1) ancestry (2.2.2)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
arel (6.0.3) arel (6.0.3)
ast (2.3.0) ast (2.3.0)
@@ -65,7 +65,7 @@ GEM
babel-source (>= 4.0, < 6) babel-source (>= 4.0, < 6)
execjs (~> 2.0) execjs (~> 2.0)
bcrypt (3.1.11) bcrypt (3.1.11)
browser (2.2.0) browser (2.3.0)
builder (3.2.2) builder (3.2.2)
bullet (5.2.0) bullet (5.2.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -180,7 +180,7 @@ GEM
activesupport (>= 3) activesupport (>= 3)
gyoku (1.3.1) gyoku (1.3.1)
builder (>= 2.1.2) builder (>= 2.1.2)
hashie (3.4.3) hashie (3.4.6)
highline (1.7.8) highline (1.7.8)
htmlentities (4.3.4) htmlentities (4.3.4)
httpi (2.4.1) httpi (2.4.1)
@@ -285,7 +285,7 @@ GEM
powerpack (0.1.1) powerpack (0.1.1)
quiet_assets (1.1.0) quiet_assets (1.1.0)
railties (>= 3.1, < 5.0) railties (>= 3.1, < 5.0)
rack (1.6.4) rack (1.6.5)
rack-accept (0.4.5) rack-accept (0.4.5)
rack (>= 0.4) rack (>= 0.4)
rack-attack (5.0.1) rack-attack (5.0.1)
@@ -317,7 +317,7 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.1.0) rainbow (2.1.0)
raindrops (0.16.0) raindrops (0.17.0)
rake (11.3.0) rake (11.3.0)
redcarpet (3.3.4) redcarpet (3.3.4)
referer-parser (0.3.0) referer-parser (0.3.0)
@@ -455,7 +455,7 @@ DEPENDENCIES
acts-as-taggable-on acts-as-taggable-on
acts_as_votable acts_as_votable
ahoy_matey (~> 1.4.2) ahoy_matey (~> 1.4.2)
ancestry (~> 2.2.1) ancestry (~> 2.2.2)
browser browser
bullet bullet
byebug byebug
@@ -524,4 +524,4 @@ DEPENDENCIES
whenever whenever
BUNDLED WITH BUNDLED WITH
1.13.1 1.13.3