Skip to content

Commit

Permalink
Bundle update
Browse files Browse the repository at this point in the history
* Failed and postponed Ruby 2.4.0: rails/rails#27458
  • Loading branch information
siruguri committed Jan 24, 2017
1 parent c99a7e0 commit 2bb4014
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 61 deletions.
11 changes: 1 addition & 10 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ gem 'rack-pjax'
gem 'remotipart'
gem 'rails_admin'

#gem 'remotipart', github: 'melvinsembrano/remotipart'
#gem 'rails_admin', github: 'sferik/rails_admin', branch: 'rails-5'

# Use SCSS for stylesheets
gem 'sass-rails'

Expand All @@ -44,14 +41,8 @@ gem 'doorkeeper'

# Integrations
gem 'stripe'

group :doc do
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', require: false
end

gem 'devise'
gem 'haml-rails'
gem 'haml'
gem 'cancan'

gem 'sidekiq'
Expand Down
83 changes: 32 additions & 51 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/sinatra/sinatra.git
revision: af6dad2a6c31e31617712b15f455b2a3d3eb1c06
revision: 5579523773551333b07204708bc1eefb3c2fc836
specs:
rack-protection (2.0.0.beta2)
rack
Expand Down Expand Up @@ -55,7 +55,7 @@ GEM
airbrussh (1.1.1)
sshkit (>= 1.6.1, != 1.7.0)
arel (7.1.4)
autoprefixer-rails (6.5.3)
autoprefixer-rails (6.6.0)
execjs
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand All @@ -70,7 +70,7 @@ GEM
builder (3.2.2)
byebug (9.0.6)
cancan (1.6.10)
capistrano (3.6.1)
capistrano (3.7.1)
airbrussh (>= 1.0.0)
capistrano-harrow
i18n
Expand All @@ -82,24 +82,24 @@ GEM
capistrano-harrow (0.5.3)
capistrano-passenger (0.2.0)
capistrano (~> 3.0)
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)
capistrano-sidekiq (0.5.4)
capistrano-sidekiq (0.10.0)
capistrano
sidekiq (>= 3.4)
capybara (2.10.1)
capybara (2.7.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
capybara-webkit (1.1.0)
capybara (~> 2.0, >= 2.0.2)
capybara-webkit (1.11.1)
capybara (>= 2.3.0, < 2.8.0)
json
cliver (0.3.2)
coderay (1.1.1)
Expand All @@ -111,9 +111,9 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
coffee-script-source (1.12.2)
concurrent-ruby (1.0.4)
connection_pool (2.2.0)
connection_pool (2.2.1)
crack (0.4.3)
safe_yaml (~> 1.0.0)
daemons (1.2.4)
Expand All @@ -127,17 +127,17 @@ GEM
responders
warden (~> 1.2.3)
docile (1.1.5)
domain_name (0.5.20161021)
domain_name (0.5.20161129)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.2.0)
railties (>= 4.2)
dotenv (2.1.1)
enumerable-lazy (0.0.2)
equalizer (0.0.11)
erubis (2.7.0)
eventmachine (1.2.0.1)
eventmachine (1.2.1)
execjs (2.7.0)
font-awesome-rails (4.7.0.0)
font-awesome-rails (4.7.0.1)
railties (>= 3.2, < 5.1)
globalid (0.3.7)
activesupport (>= 4.1.0)
Expand All @@ -153,30 +153,19 @@ GEM
virtus (>= 1.0.0)
haml (4.0.7)
tilt
haml-rails (0.9.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 4.0.6, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
hashdiff (0.3.0)
hashdiff (0.3.2)
hashie (3.4.6)
html2haml (2.0.0)
erubis (~> 2.7.0)
haml (~> 4.0.0)
nokogiri (~> 1.6.0)
ruby_parser (~> 3.5)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.7.0)
ice_nine (0.11.2)
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 (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
json (2.0.2)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -211,29 +200,29 @@ GEM
mocha (1.2.1)
metaclass (~> 0.0.1)
multi_json (1.12.1)
multi_xml (0.5.5)
multi_xml (0.6.0)
mustermann (1.0.0.beta2)
mustermann19 (0.4.4)
enumerable-lazy
nested_form (0.3.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.2.0)
net-ssh (4.0.0)
netrc (0.11.0)
nio4r (1.2.1)
nokogiri (1.6.8.1)
nokogiri (1.7.0)
mini_portile2 (~> 2.1.0)
orm_adapter (0.5.0)
pg (0.19.0)
poltergeist (1.11.0)
poltergeist (1.12.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.0)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
pry-remote (0.1.8)
Expand All @@ -242,7 +231,7 @@ GEM
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (2.0.4)
public_suffix (2.0.5)
rack (2.0.1)
rack-accept (0.4.5)
rack (>= 0.4)
Expand Down Expand Up @@ -272,7 +261,7 @@ GEM
nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_admin (1.1.0)
rails_admin (1.1.1)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
Expand All @@ -292,8 +281,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rdoc (4.3.0)
redis (3.3.1)
redis (3.3.2)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
remotipart (1.3.1)
Expand All @@ -303,21 +291,15 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
ruby_parser (3.8.3)
sexp_processor (~> 4.1)
safe_yaml (1.0.4)
sass (3.4.22)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sexp_processor (4.7.0)
sidekiq (4.2.5)
sidekiq (4.2.7)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
Expand All @@ -338,10 +320,10 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
sshkit (1.11.4)
sshkit (1.11.5)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stripe (1.56.1)
stripe (1.57.1)
rest-client (>= 1.4, < 4.0)
thin (1.7.0)
daemons (~> 1.0, >= 1.0.9)
Expand All @@ -355,7 +337,7 @@ GEM
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.3)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
underscore-rails (1.8.3)
unf (0.1.4)
Expand All @@ -373,7 +355,7 @@ GEM
activemodel (>= 5.0)
debug_inspector
railties (>= 5.0)
webmock (2.1.0)
webmock (2.3.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand Down Expand Up @@ -407,7 +389,7 @@ DEPENDENCIES
dotenv
execjs
grape
haml-rails
haml
jquery-rails
jquery-ui-rails
minitest-rails-capybara
Expand All @@ -426,7 +408,6 @@ DEPENDENCIES
redis-namespace
remotipart
sass-rails
sdoc
sidekiq
simplecov
sinatra!
Expand All @@ -445,4 +426,4 @@ RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.13.1
1.13.7

0 comments on commit 2bb4014

Please sign in to comment.