diff options
| -rw-r--r-- | Gemfile.lock | 179 |
1 files changed, 85 insertions, 94 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 51258219628..5c800b2ec5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 + revision: cfb423fb576590525c4a978bc21cc98917c3334c branch: commit-blob-rename-action specs: gitlab_git (10.3.0) @@ -68,14 +68,13 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - ast (2.2.0) + asciidoctor (1.5.4) + ast (2.3.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.0) - autoprefixer-rails (6.2.3) + attr_required (1.0.1) + autoprefixer-rails (6.3.7) execjs - json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -99,7 +98,7 @@ GEM babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) - benchmark-ips (2.3.0) + benchmark-ips (2.6.1) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -111,13 +110,13 @@ GEM brakeman (3.3.2) browser (2.2.0) builder (3.2.2) - bullet (5.0.0) + bullet (5.1.1) activesupport (>= 3.0.0) - uniform_notifier (~> 1.9.0) + uniform_notifier (~> 1.10.0) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (9.0.5) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -125,7 +124,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.11) + capybara-screenshot (1.0.13) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -137,9 +136,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.5) + chunky_png (1.3.6) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -149,15 +148,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.7.7) + colorize (0.8.1) concurrent-ruby (1.0.2) connection_pool (2.2.0) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) - css_parser (1.4.1) + css_parser (1.4.5) addressable - d3_rails (3.5.11) + d3_rails (3.5.16) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -167,7 +166,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -184,7 +183,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.2) + dropzonejs-rails (0.7.3) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -194,9 +193,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.0.8) - excon (0.49.0) - execjs (2.6.0) + eventmachine (1.2.0.1) + excon (0.50.1) + execjs (2.7.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -211,18 +210,21 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.10) - flay (2.6.1) + ffi (1.9.12) + flay (2.8.0) + erubis (~> 2.7.0) + path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.3.2) + flog (4.4.0) + path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.9.4) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -231,7 +233,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.40.0) + fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -244,8 +246,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.6) - fog-core (>= 1.39) + fog-openstack (0.1.7) + fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -256,9 +258,9 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.1.0) + font-awesome-rails (4.6.3.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.82.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.0.0) @@ -268,7 +270,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.0) + get_process_mem (0.2.1) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -285,16 +287,6 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) -<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 - gitlab_git (10.2.3) - activesupport (~> 4.0) - charlock_holmes (~> 0.7.3) - github-linguist (~> 4.7.0) - rugged (~> 0.24.0) -======= - gitlab_emoji (0.3.1) - gemojione (~> 2.2, >= 2.2.1) ->>>>>>> refactors blob_controller gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -303,7 +295,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.0) + gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -337,10 +329,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.3) + hashie (3.4.4) health_check (1.5.1) rails (>= 2.3.0) - hipchat (1.5.2) + hipchat (1.5.3) httparty mimemagic html-pipeline (1.11.0) @@ -351,10 +343,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.7.0.1) + httpclient (2.8.0) i18n (0.7.0) - ice_nine (0.11.1) - influxdb (0.2.3) + ice_nine (0.11.2) + influxdb (0.3.5) cause json ipaddress (0.8.3) @@ -369,12 +361,12 @@ GEM jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) - jwt (1.5.2) + jwt (1.5.4) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.11.1) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -385,7 +377,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.0) + license_finder (2.1.2) bundler httparty rubyzip @@ -393,9 +385,10 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -405,23 +398,24 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.0) + mime-types-data (3.2016.0521) + mimemagic (0.3.1) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.11.2) + multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.20) + mysql2 (0.3.21) nested_form (0.3.2) - net-ldap (0.12.1) - net-ssh (3.0.1) - newrelic_rpm (3.14.1.311) + net-ldap (0.14.0) + net-ssh (3.0.2) + newrelic_rpm (3.16.0.318) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) - oauth (0.4.7) + oauth (0.5.1) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -433,7 +427,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.1) + omniauth-auth0 (1.4.2) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -452,7 +446,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.2.10) @@ -487,10 +481,11 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) + paranoia (2.1.5) activerecord (~> 4.0) - parser (2.3.1.0) + parser (2.3.1.2) ast (~> 2.2) + path_expander (1.0.0) pg (0.18.4) pkg-config (1.1.7) poltergeist (1.9.0) @@ -500,10 +495,10 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.8.7) + css_parser (>= 1.4.5) htmlentities (>= 4.0.0) - premailer-rails (1.9.2) + premailer-rails (1.9.4) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.10.3) @@ -521,7 +516,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.1) + rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -556,19 +551,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.15.0) + raindrops (0.16.0) rake (10.5.0) - rb-fsevent (0.9.6) - rb-inotify (0.9.5) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.0.0) + recaptcha (3.3.0) json - redcarpet (3.3.3) - redis (3.2.2) + redcarpet (3.3.4) + redis (3.3.0) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -587,16 +582,16 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.0) + request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.2.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.0) - rqrcode (0.7.0) - chunky_png + rouge (1.11.1) + rqrcode (0.10.1) + chunky_png (~> 1.0) rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) @@ -635,12 +630,13 @@ GEM ruby-progressbar (1.8.1) ruby-saml (1.3.0) nokogiri (>= 1.5.10) + ruby_dep (1.3.1) ruby_parser (3.8.2) sexp_processor (~> 4.1) - rubyntlm (0.5.2) + rubyntlm (0.6.0) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.1.10) + rufus-scheduler (3.2.1) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -664,7 +660,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.9.3) + select2-rails (3.5.10) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -679,7 +675,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.2) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -713,7 +709,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.2) + sprockets (3.6.3) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -774,7 +770,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.0.5) + unicode-display_width (1.1.0) unicorn (4.9.0) kgio (~> 2.6) rack @@ -782,7 +778,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.9.0) + uniform_notifier (1.10.0) uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) @@ -802,7 +798,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) @@ -877,12 +873,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) -<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 - gitlab_git (~> 10.2) -======= - gitlab_emoji (~> 0.3.0) gitlab_git (~> 10.2)! ->>>>>>> refactors blob_controller gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) @@ -1007,4 +998,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.12.5 + 1.10.6 |