Skip to content

Commit

Permalink
Merge pull request #6 from ferdinandrosario/upgrade
Browse files Browse the repository at this point in the history 
updated grape and other gems to use latest version
  • Loading branch information
@dblock
dblock committed Nov 26, 2015
2 parents 7c3fbd1 + 0e9a8c0 commit 6c44bbd
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 103 deletions.
24 changes: 12 additions & 12 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.2.1'
gem 'rails', '~> 4.2.5'
gem 'sass'
gem 'sass-rails', '~> 5.0.0'
gem 'sass-rails', '~> 5.0.4'
gem 'coffee-rails', '~> 4.1.0'
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.17', platforms: [:jruby]
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.19', platforms: [:jruby]
gem 'jdbc-postgres', platform: :jruby
gem 'pg', platform: [:mri, :rbx]
gem 'jquery-rails', '~> 4.0.4'
gem 'grape', '~> 0.12.0'
gem 'uglifier', '~> 2.7'
gem 'jquery-rails', '~> 4.0.5'
gem 'grape', '~> 0.13.0'
gem 'uglifier', '~> 2.7.2'
gem 'zip-zip', '~> 0.3'

group :development, :test do
gem 'rspec', '~> 3.1'
gem 'rspec-rails', '~> 3.1'
gem 'capybara', '~> 2.4.4'
gem 'selenium-webdriver', '~> 2.46.0'
gem 'rubocop', '~> 0.33.0'
gem 'nokogiri', '1.6.2.1'
gem 'rspec', '~> 3.4.0'
gem 'rspec-rails', '~> 3.4.0'
gem 'capybara', '~> 2.5.0'
gem 'selenium-webdriver', '~> 2.48.1'
gem 'rubocop', '~> 0.35.1'
gem 'nokogiri', '1.6.6.4'
end
187 changes: 96 additions & 91 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
actionmailer (4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.3)
actionview (= 4.2.3)
activesupport (= 4.2.3)
actionpack (4.2.5)
actionview (= 4.2.5)
activesupport (= 4.2.5)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.3)
activesupport (= 4.2.3)
actionview (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.3)
activesupport (= 4.2.3)
activejob (4.2.5)
activesupport (= 4.2.5)
globalid (>= 0.3.0)
activemodel (4.2.3)
activesupport (= 4.2.3)
activemodel (4.2.5)
activesupport (= 4.2.5)
builder (~> 3.1)
activerecord (4.2.3)
activemodel (= 4.2.3)
activesupport (= 4.2.3)
activerecord (4.2.5)
activemodel (= 4.2.5)
activesupport (= 4.2.5)
arel (~> 6.0)
activerecord-jdbc-adapter (1.3.17)
activerecord-jdbc-adapter (1.3.19)
activerecord (>= 2.2)
activerecord-jdbcsqlite3-adapter (1.3.17)
activerecord-jdbc-adapter (~> 1.3.17)
activerecord-jdbcsqlite3-adapter (1.3.19)
activerecord-jdbc-adapter (~> 1.3.19)
jdbc-sqlite3 (>= 3.7.2, < 3.9)
activesupport (4.2.3)
activesupport (4.2.5)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand All @@ -50,13 +50,13 @@ GEM
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
builder (3.2.2)
capybara (2.4.4)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
childprocess (0.5.6)
childprocess (0.5.8)
ffi (~> 1.0, >= 1.0.11)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
Expand All @@ -66,18 +66,18 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
coffee-script-source (1.10.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
equalizer (0.0.11)
erubis (2.7.0)
execjs (2.5.2)
execjs (2.6.0)
ffi (1.9.10)
ffi (1.9.10-java)
globalid (0.3.6)
activesupport (>= 4.1.0)
grape (0.12.0)
grape (0.13.0)
activesupport
builder
hashie (>= 2.1.0)
Expand All @@ -87,32 +87,32 @@ GEM
rack-accept
rack-mount
virtus (>= 1.0.0)
hashie (3.4.2)
hashie (3.4.3)
i18n (0.7.0)
ice_nine (0.11.1)
jdbc-postgres (9.4.1200)
jdbc-sqlite3 (3.8.10.1)
jquery-rails (4.0.4)
jdbc-postgres (9.4.1204)
jdbc-sqlite3 (3.8.11.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
json (1.8.3-java)
loofah (2.0.2)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.1)
mini_portile (0.6.0)
minitest (5.7.0)
mime-types (2.99)
mini_portile (0.6.2)
minitest (5.8.3)
multi_json (1.11.2)
multi_xml (0.5.5)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
nokogiri (1.6.2.1-java)
parser (2.2.2.6)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
nokogiri (1.6.6.4-java)
parser (2.2.3.0)
ast (>= 1.1, < 3.0)
pg (0.18.2)
pg (0.18.4)
powerpack (0.1.1)
rack (1.6.4)
rack-accept (0.4.5)
Expand All @@ -121,86 +121,88 @@ GEM
rack (>= 1.0.0)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.3)
actionmailer (= 4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
activemodel (= 4.2.3)
activerecord (= 4.2.3)
activesupport (= 4.2.3)
rails (4.2.5)
actionmailer (= 4.2.5)
actionpack (= 4.2.5)
actionview (= 4.2.5)
activejob (= 4.2.5)
activemodel (= 4.2.5)
activerecord (= 4.2.5)
activesupport (= 4.2.5)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.3)
railties (= 4.2.5)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.6)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
railties (4.2.3)
actionpack (= 4.2.3)
activesupport (= 4.2.3)
railties (4.2.5)
actionpack (= 4.2.5)
activesupport (= 4.2.5)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.0.0)
rake (10.4.2)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
rspec (3.4.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-core (3.4.1)
rspec-support (~> 3.4.0)
rspec-expectations (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
rspec-support (~> 3.4.0)
rspec-mocks (3.4.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
rspec-support (~> 3.4.0)
rspec-rails (3.4.0)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubocop (0.33.0)
rspec-core (~> 3.4.0)
rspec-expectations (~> 3.4.0)
rspec-mocks (~> 3.4.0)
rspec-support (~> 3.4.0)
rspec-support (3.4.1)
rubocop (0.35.1)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
parser (>= 2.2.3.0, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (~> 1.7)
tins (<= 1.6.0)
ruby-progressbar (1.7.5)
rubyzip (1.1.7)
sass (3.4.16)
sass-rails (5.0.3)
sass (3.4.19)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
selenium-webdriver (2.46.2)
tilt (>= 1.1, < 3)
selenium-webdriver (2.48.1)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
sprockets (3.2.0)
rack (~> 1.0)
sprockets-rails (2.3.2)
sprockets (3.4.1)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.5)
thread_safe (0.3.5-java)
tilt (1.4.1)
tilt (2.0.1)
tins (1.6.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
virtus (1.0.5)
Expand All @@ -219,20 +221,23 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord-jdbcsqlite3-adapter (~> 1.3.17)
capybara (~> 2.4.4)
activerecord-jdbcsqlite3-adapter (~> 1.3.19)
capybara (~> 2.5.0)
coffee-rails (~> 4.1.0)
grape (~> 0.12.0)
grape (~> 0.13.0)
jdbc-postgres
jquery-rails (~> 4.0.4)
nokogiri (= 1.6.2.1)
jquery-rails (~> 4.0.5)
nokogiri (= 1.6.6.4)
pg
rails (~> 4.2.1)
rspec (~> 3.1)
rspec-rails (~> 3.1)
rubocop (~> 0.33.0)
rails (~> 4.2.5)
rspec (~> 3.4.0)
rspec-rails (~> 3.4.0)
rubocop (~> 0.35.1)
sass
sass-rails (~> 5.0.0)
selenium-webdriver (~> 2.46.0)
uglifier (~> 2.7)
sass-rails (~> 5.0.4)
selenium-webdriver (~> 2.48.1)
uglifier (~> 2.7.2)
zip-zip (~> 0.3)

BUNDLED WITH
1.10.6

0 comments on commit 6c44bbd

Please sign in to comment.