diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-11-26 12:30:28 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-11-26 12:30:28 +0200 |
| commit | 3e0fe27627f5b074a35ce2e1a0794f869f8abc15 (patch) | |
| tree | ebfdb7135c683f6687a15f4ba6f3323ae619bca0 /Gemfile.lock | |
| parent | 38489d8d7d0a352789c23d3bf9cadb169f765d5b (diff) | |
| parent | 1befbbf57dddc23761558f21017294c950d6d3b7 (diff) | |
| download | gitlab-ce-3e0fe27627f5b074a35ce2e1a0794f869f8abc15.tar.gz | |
Merge remote-tracking branch 'origin/master' into rails_update_to_4_2
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index bb4f94aeef9..1671edbc6fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,6 @@ GEM actionpack (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) railties (>= 4.0.0, < 5) - activeresource (4.0.0) - activemodel (~> 4.0) - activesupport (~> 4.0) - rails-observers (~> 0.1.1) activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) @@ -57,8 +53,11 @@ GEM activerecord (>= 3.2, <= 4.3) rake (~> 10.4) arel (6.0.3) - asana (0.0.6) - activeresource (>= 3.2.3) + asana (0.4.0) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + faraday_middleware-multi_json (~> 0.0) + oauth2 (~> 1.0) asciidoctor (1.5.3) ast (2.1.0) astrolabe (1.3.1) @@ -189,7 +188,7 @@ GEM docile (1.1.5) domain_name (0.5.25) unf (>= 0.0.5, < 1.0.0) - doorkeeper (2.1.4) + doorkeeper (2.2.2) railties (>= 3.2) dropzonejs-rails (0.7.2) rails (> 3.1) @@ -198,8 +197,6 @@ GEM launchy (~> 2.1) mail (~> 2.2) encryptor (1.3.0) - enumerize (0.7.0) - activesupport (>= 3.2) equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.0) @@ -216,6 +213,9 @@ GEM multipart-post (>= 1.2, < 3) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) + faraday_middleware-multi_json (0.0.6) + faraday_middleware + multi_json fastercsv (1.5.5) ffaker (2.0.0) ffi (1.9.10) @@ -559,8 +559,6 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.2) loofah (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) railties (4.2.4) actionpack (= 4.2.4) activesupport (= 4.2.4) @@ -836,7 +834,7 @@ DEPENDENCIES addressable (~> 2.3.8) after_commit_queue annotate (~> 2.6.0) - asana (~> 0.0.6) + asana (~> 0.4.0) asciidoctor (~> 1.5.2) attr_encrypted (~> 1.3.4) awesome_print (~> 1.2.0) @@ -865,11 +863,10 @@ DEPENDENCIES devise-async (~> 0.9.0) devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) - doorkeeper (~> 2.1.3) + doorkeeper (~> 2.2.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) - enumerize (~> 0.7.0) factory_girl_rails (~> 4.3.0) ffaker (~> 2.0.0) flay |