Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump json from 1.6.0 to 2.3.1 in /test/rails_test #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump json from 1.6.0 to 2.3.1 in /test/rails_test #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions test/rails_test/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ../../
remote: ../..
specs:
uploader (3.1.0)
uploader (3.1.4)
aws-s3
mime-types
paperclip
Expand Down Expand Up @@ -41,8 +41,7 @@ GEM
arel (2.0.10)
authlogic (3.0.2)
activerecord (~> 3.0.7)
activerecord (~> 3.0.7)
aws-s3 (0.6.2)
aws-s3 (0.6.3)
builder
mime-types
xml-simple
Expand All @@ -57,7 +56,6 @@ GEM
childprocess (0.2.2)
ffi (~> 1.0.6)
cocaine (0.2.0)
columnize (0.3.4)
cucumber (1.0.6)
builder (>= 2.1.2)
diff-lcs (>= 1.1.2)
Expand All @@ -77,12 +75,10 @@ GEM
gherkin (2.4.21)
json (>= 1.4.6)
i18n (0.5.0)
json (1.6.0)
json (2.3.1)
json_pure (1.6.0)
launchy (2.0.5)
addressable (~> 2.2.6)
linecache (0.46)
rbx-require-relative (> 0.0.4)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
Expand Down Expand Up @@ -117,7 +113,6 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
rbx-require-relative (0.0.5)
rcov (0.9.10)
rdoc (3.9.4)
rspec (2.6.0)
Expand All @@ -133,11 +128,6 @@ GEM
activesupport (~> 3.0)
railties (~> 3.0)
rspec (~> 2.6.0)
ruby-debug (0.10.4)
columnize (>= 0.1)
ruby-debug-base (~> 0.10.4.0)
ruby-debug-base (0.10.4)
linecache (>= 0.3)
rubyzip (0.9.4)
selenium-webdriver (2.6.0)
childprocess (>= 0.2.1)
Expand All @@ -152,7 +142,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
xml-simple (1.1.0)
xml-simple (1.1.5)
xpath (0.1.4)
nokogiri (~> 1.3)

Expand All @@ -175,7 +165,6 @@ DEPENDENCIES
rcov
rspec (>= 2.4.0)
rspec-rails (>= 2.4.0)
ruby-debug
shoulda
spork
uploader!