diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-06 17:04:50 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-10 12:11:27 +0200 |
| commit | acbac26a5a847f7e5aadeae0a67219d651fb8913 (patch) | |
| tree | 5f4f950b136159466578e809520fdec359f1702d /Gemfile.lock | |
| parent | ede272406a36d8263ababd7aab86ece5d9a9b9b5 (diff) | |
| download | gitlab-ce-acbac26a5a847f7e5aadeae0a67219d651fb8913.tar.gz | |
Use gems that works with rails 4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f9768ac53ec..8d9aa401fb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: https://github.com/gitlabhq/gon.git + revision: 58ca8e17273051cb370182cabd3602d1da6783ab + ref: 58ca8e17273051cb370182cabd3602d1da6783ab + specs: + gon (4.1.1) + actionpack (>= 2.3.0) + json + GEM remote: https://rubygems.org/ specs: @@ -201,9 +210,6 @@ GEM omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.1.1) - gon (4.1.1) - actionpack (>= 2.3.0) - json grape (0.4.1) activesupport builder @@ -255,7 +261,7 @@ GEM rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) jasmine-core (1.3.1) - jquery-atwho-rails (0.3.0) + jquery-atwho-rails (0.4.1) jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) @@ -601,7 +607,7 @@ DEPENDENCIES gitlab_git (~> 4.0.0.pre) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.3) - gon + gon! grape (~> 0.4.1) grape-entity (~> 0.3.0) growl @@ -611,7 +617,7 @@ DEPENDENCIES hipchat (~> 0.9.0) httparty jasmine - jquery-atwho-rails (= 0.3.0) + jquery-atwho-rails (~> 0.4.1) jquery-rails (= 2.1.3) jquery-turbolinks jquery-ui-rails (= 2.0.2) |