diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e64df94da..261941455 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: git://github.com/henare/globalize3.git - revision: 2931f559cbed8843ab7d16278d70ce99a0239132 - branch: not-null-empty-attributes + remote: git://github.com/globalize/globalize.git + revision: 5fd95f2389dff13c9368fb2e08c96c8a48798c72 + ref: 5fd95f2389dff1 specs: globalize3 (0.3.0) activemodel (>= 3.0.0) @@ -115,9 +115,11 @@ GEM hike (1.2.3) i18n (0.6.5) journey (1.0.4) - jquery-rails (2.3.0) + jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jquery-ui-rails (4.1.0) + railties (>= 3.1.0) json (1.8.1) libv8 (3.16.14.3) linecache (0.46) @@ -147,7 +149,7 @@ GEM net-ssh (2.6.7) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - newrelic_rpm (3.6.2.96) + newrelic_rpm (3.6.8.164) nokogiri (1.5.9) paper_trail (2.7.2) activerecord (~> 3.0) @@ -257,7 +259,7 @@ GEM execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) unicode (0.4.4) - unidecode (1.0.0) + unidecoder (1.1.2) vpim (0.695) webrat (0.7.3) nokogiri (>= 1.2.0) @@ -290,7 +292,8 @@ DEPENDENCIES gettext gettext_i18n_rails globalize3! - jquery-rails (~> 2.1) + jquery-rails (~> 3.0.4) + jquery-ui-rails json locale mahoro @@ -316,9 +319,10 @@ DEPENDENCIES statistics2 (~> 0.54) syslog_protocol therubyracer + thin uglifier (>= 1.0.3) unicode - unidecode + unidecoder vpim webrat will_paginate |