diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-04-24 16:01:39 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-04-24 16:01:39 +0100 |
commit | d3eec6f983f8524e28e8ffe42ba3a10efaa0a30e (patch) | |
tree | 4c9cd3a9709a18a46d179e4af63bc7bcfa117b66 /Gemfile.lock | |
parent | cc3da49bc927175a49d7150b98d762f65e143d21 (diff) | |
parent | d3aae5cc48c92473e06b2104bb9431305d5a92f0 (diff) |
Merge branch 'release/0.9' into rails-3-develop
Conflicts:
Gemfile.lock
app/controllers/public_body_controller.rb
app/mailers/track_mailer.rb
app/views/request/_hidden_correspondence.html.erb
app/views/request/_sidebar.html.erb
app/views/request/hidden.html.erb
app/views/request/new_please_describe.html.erb
app/views/request/preview.html.erb
app/views/user/show.html.erb
config/environment.rb
config/routes.rb
spec/controllers/public_body_controller_spec.rb
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6c190836f..abb8ef8cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,7 @@ GEM rest-client (1.6.7) mime-types (>= 1.16) rmagick (2.13.2) - routing-filter (0.2.4) + routing-filter (0.3.1) actionpack rspec-core (2.12.1) rspec-expectations (2.12.0) @@ -247,13 +247,14 @@ DEPENDENCIES dynamic_form exception_notification fakeweb - fast_gettext (>= 0.6.0) + fast_gettext fastercsv (>= 1.5.5) - gettext (~> 2.3.3) - gettext_i18n_rails (>= 0.7.1) globalize3! + gettext + gettext_i18n_rails json - locale (>= 2.0.5) + launchy + locale mahoro mailcatcher memcache-client @@ -267,8 +268,8 @@ DEPENDENCIES rdoc recaptcha (~> 0.3.1) rmagick - routing-filter (~> 0.2.4) rspec-rails + routing-filter ruby-debug ruby-msg (~> 1.5.0) spork-rails |