diff options
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a22bd1b1f52..dfc15700494 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GEM after_commit_queue (1.3.0) activerecord (>= 3.0) akismet (2.0.0) - allocations (1.0.5) + allocations (1.0.4) arel (6.0.3) asana (0.4.0) faraday (~> 0.9) @@ -97,7 +97,16 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - brakeman (3.3.2) + brakeman (3.2.1) + erubis (~> 2.6) + haml (>= 3.0, < 5.0) + highline (>= 1.6.20, < 2.0) + ruby2ruby (~> 2.3.0) + ruby_parser (~> 3.8.1) + safe_yaml (>= 1.0) + sass (~> 3.0) + slim (>= 1.3.6, < 4.0) + terminal-table (~> 1.4) browser (2.0.3) builder (3.2.2) bullet (5.0.0) @@ -124,8 +133,6 @@ GEM mime-types (>= 1.16) cause (0.1) charlock_holmes (0.7.3) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) chunky_png (1.3.5) cliver (0.3.2) coderay (1.1.0) @@ -277,7 +284,7 @@ GEM posix-spawn (~> 0.3) gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) - gitlab_git (10.1.3) + gitlab_git (10.1.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -331,6 +338,7 @@ GEM hashie (3.4.3) health_check (1.5.1) rails (>= 2.3.0) + highline (1.7.8) hipchat (1.5.2) httparty mimemagic @@ -400,7 +408,7 @@ GEM mime-types (>= 1.16, < 4) mail_room (0.7.0) method_source (0.8.2) - mime-types (2.99.2) + mime-types (2.99.1) mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) @@ -416,7 +424,6 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) - numerizer (0.1.1) oauth (0.4.7) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) @@ -556,6 +563,7 @@ GEM rainbow (2.1.0) raindrops (0.15.0) rake (10.5.0) + raphael-rails (2.1.2) rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) @@ -634,7 +642,10 @@ GEM ruby-saml (1.1.2) nokogiri (>= 1.5.10) uuid (~> 2.3) - ruby_parser (3.8.2) + ruby2ruby (2.3.0) + ruby_parser (~> 3.1) + sexp_processor (~> 4.0) + ruby_parser (3.8.1) sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) @@ -644,7 +655,7 @@ GEM safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) - sass (3.4.22) + sass (3.4.21) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -693,6 +704,9 @@ GEM tilt (>= 1.3, < 3) six (0.2.0) slack-notifier (1.2.1) + slim (3.0.6) + temple (~> 0.7.3) + tilt (>= 1.3.3, < 2.1) slop (3.6.0) spinach (0.8.10) colorize @@ -733,8 +747,10 @@ GEM railties (>= 3.2.5, < 6) teaspoon-jasmine (2.2.0) teaspoon (>= 1.0.0) + temple (0.7.6) term-ansicolor (1.3.2) tins (~> 1.0) + terminal-table (1.5.2) test_after_commit (0.4.2) activerecord (>= 3.2) thin (1.6.4) @@ -743,7 +759,7 @@ GEM rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.5) + tilt (2.0.2) timecop (0.8.1) timfel-krb5-auth (0.8.3) tinder (1.10.1) @@ -832,7 +848,7 @@ DEPENDENCIES better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) - brakeman (~> 3.3.0) + brakeman (~> 3.2.0) browser (~> 2.0.3) bullet bundler-audit @@ -841,7 +857,6 @@ DEPENDENCIES capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) charlock_holmes (~> 0.7.3) - chronic_duration (~> 0.10.6) coffee-rails (~> 4.1.0) connection_pool (~> 2.0) coveralls (~> 0.8.2) @@ -937,6 +952,7 @@ DEPENDENCIES rails (= 4.2.6) rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) + raphael-rails (~> 2.1.2) rblineprof rdoc (~> 3.6) recaptcha (~> 3.0) |