diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-08 13:46:21 +0100 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-08 13:46:21 +0100 |
commit | 5d6b90a050a30442f9cd44eafa1c7ed79f005bba (patch) | |
tree | 35ee9f3848a1e747d4f5001572a83383d6d4c1e6 | |
parent | a42714a05eadb13e3ba4dd404d676d7ee8511b97 (diff) | |
download | gitlab-ce-5d6b90a050a30442f9cd44eafa1c7ed79f005bba.tar.gz |
changes gemfile.lock
-rw-r--r-- | Gemfile.lock | 159 |
1 files changed, 77 insertions, 82 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f300e196865..055596b056f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,13 +57,14 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.4) - ast (2.3.0) + asciidoctor (1.5.3) + ast (2.2.0) attr_encrypted (3.0.1) encryptor (~> 3.0.0) - attr_required (1.0.1) - autoprefixer-rails (6.3.7) + attr_required (1.0.0) + autoprefixer-rails (6.2.3) execjs + json awesome_print (1.2.0) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -87,7 +88,7 @@ GEM babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) - benchmark-ips (2.6.1) + benchmark-ips (2.3.0) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -99,13 +100,13 @@ GEM brakeman (3.3.2) browser (2.2.0) builder (3.2.2) - bullet (5.1.1) + bullet (5.0.0) activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) + uniform_notifier (~> 1.9.0) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (9.0.5) + byebug (8.2.1) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -113,7 +114,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (1.0.13) + capybara-screenshot (1.0.11) capybara (>= 1.0, < 3) launchy carrierwave (0.10.0) @@ -125,9 +126,9 @@ GEM charlock_holmes (0.7.3) chronic_duration (0.10.6) numerizer (~> 0.1.1) - chunky_png (1.3.6) + chunky_png (1.3.5) cliver (0.3.2) - coderay (1.1.1) + coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) coffee-rails (4.1.1) @@ -137,15 +138,15 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - colorize (0.8.1) + colorize (0.7.7) 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.5) + css_parser (1.4.1) addressable - d3_rails (3.5.16) + d3_rails (3.5.11) railties (>= 3.1.0) daemons (1.2.3) database_cleaner (1.4.1) @@ -155,7 +156,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.2.0) + devise (4.1.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -172,7 +173,7 @@ GEM docile (1.1.5) doorkeeper (4.0.0) railties (>= 4.2) - dropzonejs-rails (0.7.3) + dropzonejs-rails (0.7.2) rails (> 3.1) email_reply_parser (0.5.8) email_spec (1.6.0) @@ -182,9 +183,9 @@ GEM equalizer (0.0.11) erubis (2.7.0) escape_utils (1.1.1) - eventmachine (1.2.0.1) - excon (0.50.1) - execjs (2.7.0) + eventmachine (1.0.8) + excon (0.49.0) + execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -199,21 +200,18 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.13) - flay (2.8.0) - erubis (~> 2.7.0) - path_expander (~> 1.0) + ffi (1.9.10) + flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flog (4.4.0) - path_expander (~> 1.0) + flog (4.3.2) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.4) flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.4) - fog-core (~> 1.38) + fog-aws (0.9.2) + fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -222,7 +220,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.42.0) + fog-core (1.40.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -235,8 +233,8 @@ GEM multi_json (~> 1.10) fog-local (0.3.0) fog-core (~> 1.27) - fog-openstack (0.1.7) - fog-core (>= 1.40) + fog-openstack (0.1.6) + fog-core (>= 1.39) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -247,9 +245,9 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-rails (4.6.3.1) + font-awesome-rails (4.6.1.0) railties (>= 3.2, < 5.1) - foreman (0.82.0) + foreman (0.78.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.0.0) @@ -259,7 +257,7 @@ GEM rugged (~> 0.21) gemojione (2.6.1) json - get_process_mem (0.2.1) + get_process_mem (0.2.0) gherkin-ruby (0.3.2) github-linguist (4.7.6) charlock_holmes (~> 0.7.3) @@ -276,7 +274,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.3.0) + gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -289,7 +287,7 @@ GEM rubyntlm (~> 0.3) globalid (0.3.6) activesupport (>= 4.1.0) - gollum-grit_adapter (1.0.1) + gollum-grit_adapter (1.0.0) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.1.0) github-markup (~> 1.3.3) @@ -323,10 +321,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.4) + hashie (3.4.3) health_check (1.5.1) rails (>= 2.3.0) - hipchat (1.5.3) + hipchat (1.5.2) httparty mimemagic html-pipeline (1.11.0) @@ -337,10 +335,10 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.0) + httpclient (2.7.0.1) i18n (0.7.0) - ice_nine (0.11.2) - influxdb (0.3.5) + ice_nine (0.11.1) + influxdb (0.2.3) cause json ipaddress (0.8.3) @@ -360,7 +358,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) - knapsack (1.11.1) + knapsack (1.11.0) rake timecop (>= 0.1.0) launchy (2.4.3) @@ -371,7 +369,7 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (2.1.2) + license_finder (2.1.0) bundler httparty rubyzip @@ -379,10 +377,9 @@ GEM xml-simple licensee (8.0.0) rugged (>= 0.24b) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.0.5) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) macaddr (1.7.1) @@ -392,18 +389,18 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.1) + mimemagic (0.3.0) mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.21) + mysql2 (0.3.20) nested_form (0.3.2) - net-ldap (0.14.0) - net-ssh (3.0.2) - newrelic_rpm (3.16.0.318) + net-ldap (0.12.1) + net-ssh (3.0.1) + newrelic_rpm (3.14.1.311) nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) @@ -420,7 +417,7 @@ GEM omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) - omniauth-auth0 (1.4.2) + omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) @@ -439,7 +436,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.2) + omniauth-gitlab (1.0.1) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.2.10) @@ -474,11 +471,10 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.5) + paranoia (2.1.4) activerecord (~> 4.0) - parser (2.3.1.2) + parser (2.3.1.0) ast (~> 2.2) - path_expander (1.0.0) pg (0.18.4) pkg-config (1.1.7) poltergeist (1.9.0) @@ -488,10 +484,10 @@ GEM websocket-driver (>= 0.2.0) posix-spawn (0.3.11) powerpack (0.1.1) - premailer (1.8.7) - css_parser (>= 1.4.5) + premailer (1.8.6) + css_parser (>= 1.3.6) htmlentities (>= 4.0.0) - premailer-rails (1.9.4) + premailer-rails (1.9.2) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) pry (0.10.3) @@ -509,7 +505,7 @@ GEM rack-cors (0.4.0) rack-mount (0.8.3) rack (>= 1.0.0) - rack-oauth2 (1.2.3) + rack-oauth2 (1.2.1) activesupport (>= 2.3) attr_required (>= 0.0.5) httpclient (>= 2.4) @@ -544,19 +540,19 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) - raindrops (0.16.0) + raindrops (0.15.0) rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) + rb-fsevent (0.9.6) + rb-inotify (0.9.5) ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rdoc (3.12.2) json (~> 1.4) - recaptcha (3.3.0) + recaptcha (3.0.0) json - redcarpet (3.3.4) - redis (3.3.0) + redcarpet (3.3.3) + redis (3.2.2) redis-actionpack (4.0.1) actionpack (~> 4) redis-rack (~> 1.5.0) @@ -575,23 +571,23 @@ GEM redis-store (~> 1.1.0) redis-store (1.1.7) redis (>= 2.2) - request_store (1.3.1) + request_store (1.3.0) rerun (0.11.0) listen (~> 3.0) - responders (2.2.0) + responders (2.1.1) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (1.11.1) - rqrcode (0.10.1) - chunky_png (~> 1.0) + rouge (1.11.0) + rqrcode (0.7.0) + chunky_png rqrcode-rails3 (0.1.7) rqrcode (>= 0.4.2) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.1) + rspec-core (3.5.0) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -599,7 +595,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-rails (3.5.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -623,13 +619,12 @@ 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.6.0) + rubyntlm (0.5.2) rubypants (0.2.0) rubyzip (1.2.0) - rufus-scheduler (3.2.1) + rufus-scheduler (3.1.10) rugged (0.24.0) safe_yaml (1.0.4) sanitize (2.1.0) @@ -653,7 +648,7 @@ GEM seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) - select2-rails (3.5.10) + select2-rails (3.5.9.3) thor (~> 0.14) sentry-raven (1.1.0) faraday (>= 0.7.6) @@ -668,7 +663,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - sidekiq-cron (0.4.2) + sidekiq-cron (0.4.0) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -702,7 +697,7 @@ GEM spring (>= 0.9.1) spring-commands-teaspoon (0.0.2) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.6.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.1.1) @@ -763,7 +758,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.0.5) unicorn (4.9.0) kgio (~> 2.6) rack @@ -771,7 +766,7 @@ GEM unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) - uniform_notifier (1.10.0) + uniform_notifier (1.9.0) uuid (2.3.8) macaddr (~> 1.0) version_sorter (2.0.0) @@ -791,7 +786,7 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.6.4) + websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) wikicloth (0.8.1) |