diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-16 15:50:39 +1100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-02 15:35:45 +0100 |
| commit | 2bab7c8a67c819ef2ab4cd610326c5b28ccf9c13 (patch) | |
| tree | d3727a294aa7dbbde57a374cd3636d494c39761b | |
| parent | 55bf51fb3e6fc4d0cd76b10bbea99cd9d7b4fb53 (diff) | |
Remove version restrictions on gems related to i18n
Conflicts:
Gemfile.lock
| -rw-r--r-- | Gemfile | 10 | ||||
| -rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 10 insertions, 10 deletions
@@ -43,11 +43,11 @@ gem 'rack-ssl' # Gems related to internationalisation # Also in vendor/plugins there is globalize2 -gem 'fast_gettext', '>= 0.6.0' -gem 'gettext_i18n_rails', '>= 0.7.1' -gem 'gettext', '~> 2.3.3' -gem 'locale', '>= 2.0.5' -gem 'routing-filter', '~> 0.2.4' +gem 'fast_gettext' +gem 'gettext_i18n_rails' +gem 'gettext' +gem 'locale' +gem 'routing-filter' group :test do gem 'fakeweb' diff --git a/Gemfile.lock b/Gemfile.lock index 23a362d08..b019e7fe3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,13 +198,13 @@ DEPENDENCIES coveralls erubis fakeweb - fast_gettext (>= 0.6.0) + fast_gettext fastercsv (>= 1.5.5) - gettext (~> 2.3.3) - gettext_i18n_rails (>= 0.7.1) + gettext + gettext_i18n_rails json launchy - locale (>= 2.0.5) + locale mahoro mail (~> 2.4.4) mailcatcher @@ -220,7 +220,7 @@ DEPENDENCIES rdoc recaptcha (~> 0.3.1) rmagick - routing-filter (~> 0.2.4) + routing-filter rspec-rails (~> 1.3.4) ruby-debug ruby-debug19 |