Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/bundler/vcr-3.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Floppy committed Jun 21, 2017
2 parents 83794d3 + 2e7749b commit 59c5d2f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ end
gem 'bootstrap-sass', '~> 3.1.1'
gem 'rack-google-analytics'
gem 'mongoid', '~> 5.1'
gem 'bson', '3.1.1'
gem 'bson', '3.2.6'
gem 'mongoid-grid_fs', '~> 2.2'
gem 'bson_ext'
gem 'kaminari'
Expand Down
15 changes: 7 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ GEM
rails (>= 3.1)
bootstrap-sass (3.1.1.1)
sass (~> 3.2)
bson (3.1.1)
bson (3.2.6)
bson_ext (1.5.1)
builder (3.2.3)
capybara (2.4.4)
Expand Down Expand Up @@ -324,9 +324,8 @@ GEM
nokogiri (>= 1.5.11, < 2.0.0)
font-awesome-rails (4.7.0.2)
railties (>= 3.2, < 5.2)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
gh (0.14.0)
addressable
Expand Down Expand Up @@ -371,7 +370,7 @@ GEM
htmlentities (4.3.4)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.0)
httpclient (2.8.3)
i18n (0.8.4)
inflecto (0.0.2)
ipaddress (0.8.3)
Expand Down Expand Up @@ -462,7 +461,7 @@ GEM
method_source (~> 0.8.1)
slop (~> 3.4)
puma (3.9.1)
pusher (1.1.0)
pusher (1.3.1)
httpclient (~> 2.7)
multi_json (~> 1.0)
pusher-signature (~> 0.1.8)
Expand Down Expand Up @@ -629,7 +628,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.10)
sqlite3 (1.3.13)
sxp (1.0.0)
rdf (~> 2.0)
term-ansicolor (1.6.0)
Expand Down Expand Up @@ -694,7 +693,7 @@ DEPENDENCIES
alternate_rails!
bootstrap-kaminari-views
bootstrap-sass (~> 3.1.1)
bson (= 3.1.1)
bson (= 3.2.6)
bson_ext
cloudflare
coffee-rails (~> 4.2.2)
Expand Down

0 comments on commit 59c5d2f

Please sign in to comment.