diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 15:56:02 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 15:56:02 +0300 |
commit | 0b5d627cd4a3f81934e7772e3558356c9dd2e3cf (patch) | |
tree | a232d232e543ef372d91d0dfffbc93985f37d982 /Gemfile.lock | |
parent | 90c338a49541c95452181af9e0d0bcf9da6c51ad (diff) | |
parent | 0d610270d9634b783137bc6318eff4aa82572a7d (diff) |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1c64a622cd2..2c0d376f238 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,8 +265,6 @@ GEM flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.2) - rack (~> 1.5.1) gitlab-grit (2.7.3) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) @@ -279,7 +277,7 @@ GEM gitlab_ci_meta (4.0) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.2.14) + gitlab_git (7.2.15) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -387,7 +385,7 @@ GEM systemu (~> 2.6.2) mail (2.6.3) mime-types (>= 1.16, < 3) - mail_room (0.4.1) + mail_room (0.4.2) method_source (0.8.2) mime-types (1.25.1) mimemagic (0.3.0) @@ -456,6 +454,10 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) opennebula (4.12.1) json nokogiri @@ -595,6 +597,8 @@ GEM powerpack (~> 0.0.6) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) + ruby-fogbugz (0.1.1) + crack ruby-progressbar (1.7.5) ruby-saml (1.0.0) nokogiri (>= 1.5.10) @@ -629,6 +633,8 @@ GEM thor (~> 0.14) settingslogic (2.0.9) sexp_processor (4.6.0) + sham_rack (1.3.6) + rack shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) @@ -818,11 +824,10 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_ci_meta (~> 4.0) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.2.14) + gitlab_git (~> 7.2.15) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.0.2) @@ -842,7 +847,7 @@ DEPENDENCIES jquery-ui-rails (~> 4.2.1) kaminari (~> 0.15.1) letter_opener (~> 1.1.2) - mail_room (~> 0.4.1) + mail_room (~> 0.4.2) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) @@ -860,6 +865,7 @@ DEPENDENCIES omniauth-saml (~> 1.4.0) omniauth-shibboleth (~> 1.1.1) omniauth-twitter (~> 1.0.1) + omniauth_crowd org-ruby (~> 0.9.12) paranoia (~> 2.0) pg (~> 0.18.2) @@ -882,12 +888,14 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.3.0) rubocop (~> 0.28.0) + ruby-fogbugz sanitize (~> 2.0) sass-rails (~> 4.0.5) sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) settingslogic (~> 2.0.9) + sham_rack shoulda-matchers (~> 2.8.0) sidekiq (~> 3.3) sidetiq (~> 0.6.3) |