update rails to 3.2.15 and some dev gems

pull/554/head
Philipp Tessenow 11 years ago
parent ba13ad009d
commit 065c9e66a6
  1. 2
      Gemfile
  2. 115
      Gemfile.lock

@ -28,7 +28,7 @@
source 'https://rubygems.org'
gem "rails", "~> 3.2.14"
gem "rails", "~> 3.2.15"
gem "coderay", "~> 1.0.5"
gem "rubytree", "~> 0.8.3"

@ -25,12 +25,12 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.14)
actionpack (= 3.2.14)
actionmailer (3.2.15)
actionpack (= 3.2.15)
mail (~> 2.5.4)
actionpack (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
actionpack (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@ -38,18 +38,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.14)
activesupport (= 3.2.14)
activemodel (3.2.15)
activesupport (= 3.2.15)
builder (~> 3.0.0)
activerecord (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activerecord (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activesupport (3.2.14)
activeresource (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
activesupport (3.2.15)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
acts_as_list (0.2.0)
@ -58,12 +58,12 @@ GEM
arel (3.0.2)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
binding_of_caller (0.7.1)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bourne (1.4.0)
mocha (~> 0.13.2)
builder (3.0.4)
byebug (1.8.2)
byebug (2.3.1)
columnize (~> 0.3.6)
debugger-linecache (~> 1.2.0)
capybara (2.1.0)
@ -74,6 +74,8 @@ GEM
xpath (~> 2.0)
capybara-screenshot (0.3.6)
capybara (>= 1.0, < 3)
celluloid (0.15.2)
timers (~> 1.1.0)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
coderay (1.0.9)
@ -86,11 +88,11 @@ GEM
coffee-script-source (1.6.2)
color-tools (1.3.0)
columnize (0.3.6)
cucumber (1.3.6)
cucumber (1.3.8)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12.0)
multi_json (~> 1.7.5)
gherkin (~> 2.12.1)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.0.2)
cucumber-rails (1.3.1)
capybara (>= 1.1.2)
@ -131,18 +133,18 @@ GEM
fastercsv (1.5.5)
ffi (1.9.0)
formatador (0.2.4)
gherkin (2.12.1)
gherkin (2.12.2)
multi_json (~> 1.3)
guard (1.8.0)
guard (2.2.2)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
listen (~> 2.1)
lumberjack (~> 1.0)
pry (>= 0.9.12)
thor (>= 0.18.1)
guard-cucumber (1.4.0)
cucumber (>= 1.2.0)
guard (>= 1.1.0)
guard-rspec (3.0.1)
guard-rspec (3.1.0)
guard (>= 1.8)
rspec (~> 2.13)
guard-test (1.0.0)
@ -150,7 +152,7 @@ GEM
test-unit (~> 2.2)
hike (1.2.3)
htmldiff (0.0.1)
i18n (0.6.4)
i18n (0.6.5)
interception (0.3)
journey (1.0.4)
jquery-rails (2.0.3)
@ -159,7 +161,7 @@ GEM
jquery-ui-rails (4.0.2)
jquery-rails
railties (>= 3.1.0)
json (1.8.0)
json (1.8.1)
json_spec (1.1.1)
multi_json (~> 1.0)
rspec (~> 2.0)
@ -168,20 +170,20 @@ GEM
letter_opener (1.0.0)
launchy (>= 2.0.4)
libv8 (3.11.8.17)
listen (1.1.5)
listen (2.1.2)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.3)
lumberjack (1.0.4)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
method_source (0.8.1)
mime-types (1.23)
method_source (0.8.2)
mime-types (1.25)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.7.9)
multi_json (1.8.2)
multi_test (0.0.2)
mysql (2.9.1)
mysql2 (0.3.11)
@ -200,8 +202,8 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
pry-byebug (1.1.2)
byebug (~> 1.6)
pry-byebug (1.2.0)
byebug (~> 2.2)
pry (~> 0.9.12)
pry-debugger (0.2.2)
debugger (~> 1.3)
@ -209,14 +211,14 @@ GEM
pry-doc (0.4.6)
pry (>= 0.9)
yard (>= 0.8)
pry-rails (0.3.0)
pry-rails (0.3.2)
pry (>= 0.9.10)
pry-rescue (1.1.1)
interception (>= 0.3)
pry
pry-stack_explorer (0.4.9)
pry-stack_explorer (0.4.9.1)
binding_of_caller (>= 0.7)
pry (~> 0.9.11)
pry (>= 0.9.11)
rabl (0.9.0)
activesupport (>= 2.3.14)
rack (1.4.5)
@ -229,31 +231,29 @@ GEM
rack_session_access (0.1.1)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (3.2.14)
actionmailer (= 3.2.14)
actionpack (= 3.2.14)
activerecord (= 3.2.14)
activeresource (= 3.2.14)
activesupport (= 3.2.14)
rails (3.2.15)
actionmailer (= 3.2.15)
actionpack (= 3.2.15)
activerecord (= 3.2.15)
activeresource (= 3.2.15)
activesupport (= 3.2.15)
bundler (~> 1.0)
railties (= 3.2.14)
railties (= 3.2.15)
rails-dev-tweaks (0.6.1)
actionpack (~> 3.1)
railties (~> 3.1)
rails_autolink (1.1.0)
rails (> 3.1)
railties (3.2.14)
actionpack (= 3.2.14)
activesupport (= 3.2.14)
railties (3.2.15)
actionpack (= 3.2.15)
activesupport (= 3.2.15)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.0)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
rb-inotify (0.9.2)
ffi (>= 0.5.0)
rb-readline (0.5.0)
rdoc (3.12.2)
@ -308,7 +308,7 @@ GEM
multi_json
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
slop (3.4.5)
slop (3.4.6)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
@ -332,10 +332,11 @@ GEM
thor (0.18.1)
tilt (1.4.1)
timecop (0.6.1)
treetop (1.4.14)
timers (1.1.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
tzinfo (0.3.38)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@ -343,7 +344,7 @@ GEM
will_paginate (3.0.4)
xpath (2.0.0)
nokogiri (~> 1.3)
yard (0.8.6.1)
yard (0.8.7.2)
PLATFORMS
ruby
@ -399,7 +400,7 @@ DEPENDENCIES
pry-stack_explorer
rabl
rack_session_access
rails (~> 3.2.14)
rails (~> 3.2.15)
rails-dev-tweaks (~> 0.6.1)
rails_autolink
rb-fsevent

Loading…
Cancel
Save