diff options
author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-12 16:10:27 +0100 |
---|---|---|
committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-12 16:10:27 +0100 |
commit | 4a7e1c64dc5ea834188ab0ad8886931cc7c9a8ef (patch) | |
tree | 5afafd9a98c9e3b67fea13db23e2fdeab547d860 | |
parent | a6a847599243e59dcb94fe31be519d09bab72c82 (diff) | |
download | gitlab-ce-4a7e1c64dc5ea834188ab0ad8886931cc7c9a8ef.tar.gz |
restores gemfile.lock
-rw-r--r-- | Gemfile.lock | 192 |
1 files changed, 96 insertions, 96 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 199ee684970..10bee450bff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,14 +57,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) @@ -106,7 +105,7 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (8.2.5) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -114,7 +113,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) @@ -126,9 +125,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) @@ -138,15 +137,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) @@ -156,7 +155,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) @@ -173,7 +172,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) @@ -183,9 +182,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.51.0) + execjs (2.7.0) expression_parser (0.9.0) factory_girl (4.5.0) activesupport (>= 3.0.0) @@ -200,7 +199,7 @@ GEM faraday_middleware multi_json ffaker (2.0.0) - ffi (1.9.10) + ffi (1.9.14) flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) @@ -210,8 +209,8 @@ GEM 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) @@ -220,7 +219,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) @@ -233,8 +232,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) @@ -245,7 +244,7 @@ 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) thor (~> 0.19.1) @@ -257,7 +256,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) @@ -287,7 +286,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) @@ -321,10 +320,10 @@ GEM temple (~> 0.7.6) thor tilt - hashie (3.4.3) - health_check (1.5.1) - rails (>= 2.3.0) - hipchat (1.5.2) + hashie (3.4.4) + health_check (2.1.0) + rails (>= 4.0) + hipchat (1.5.3) httparty mimemagic html-pipeline (1.11.0) @@ -335,10 +334,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) @@ -358,7 +357,7 @@ GEM 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) @@ -369,7 +368,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 @@ -377,9 +376,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) @@ -389,23 +389,23 @@ GEM mail_room (0.8.0) method_source (0.8.2) mime-types (2.99.2) - mimemagic (0.3.0) + mimemagic (0.3.1) 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.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.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -417,7 +417,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) @@ -436,15 +436,14 @@ 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) - addressable (~> 2.3) - jwt (~> 1.0) + omniauth-google-oauth2 (0.4.1) + jwt (~> 1.5.2) multi_json (~> 1.3) omniauth (>= 1.1.1) - omniauth-oauth2 (~> 1.3.1) + omniauth-oauth2 (>= 1.3.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -453,7 +452,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-saml (1.6.0) @@ -471,9 +470,9 @@ 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) pg (0.18.4) pkg-config (1.1.7) @@ -484,13 +483,13 @@ 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) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) @@ -505,7 +504,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) @@ -540,19 +539,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) @@ -571,23 +570,23 @@ 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) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.0) + rspec-core (3.5.1) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -595,7 +594,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.0) + rspec-rails (3.5.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -617,14 +616,15 @@ GEM ruby-fogbugz (0.2.1) crack (~> 0.4) ruby-progressbar (1.8.1) - ruby-saml (1.3.0) + ruby-saml (1.3.1) 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) @@ -648,7 +648,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) @@ -663,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.0) + sidekiq-cron (0.4.2) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) @@ -697,7 +697,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) @@ -758,7 +758,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 @@ -786,7 +786,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) @@ -806,7 +806,7 @@ DEPENDENCIES activerecord-session_store (~> 1.0.0) acts-as-taggable-on (~> 3.4) addressable (~> 2.3.8) - after_commit_queue + after_commit_queue (~> 1.3.0) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.4.0) @@ -815,15 +815,15 @@ DEPENDENCIES awesome_print (~> 1.2.0) babosa (~> 1.0.2) base32 (~> 0.3.0) - benchmark-ips + benchmark-ips (~> 2.3.0) better_errors (~> 1.0.1) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) brakeman (~> 3.3.0) browser (~> 2.2) - bullet - bundler-audit - byebug + bullet (~> 5.0.0) + bundler-audit (~> 0.5.0) + byebug (~> 8.2.1) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) @@ -844,8 +844,8 @@ DEPENDENCIES email_spec (~> 1.6.0) factory_girl_rails (~> 4.6.0) ffaker (~> 2.0.0) - flay - flog + flay (~> 2.6.1) + flog (~> 4.3.2) fog-aws (~> 0.9) fog-azure (~> 0.0) fog-core (~> 1.40) @@ -854,7 +854,7 @@ DEPENDENCIES fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.6.1) - foreman + foreman (~> 0.78.0) fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) gemojione (~> 2.6) @@ -870,7 +870,7 @@ DEPENDENCIES grape (~> 0.13.0) grape-entity (~> 0.4.2) hamlit (~> 2.5) - health_check (~> 1.5.1) + health_check (~> 2.1.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) httparty (~> 0.13.3) @@ -881,9 +881,9 @@ DEPENDENCIES jquery-ui-rails (~> 5.0.0) jwt kaminari (~> 0.17.0) - knapsack + knapsack (~> 1.11.0) letter_opener_web (~> 1.3.0) - license_finder + license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) mail_room (~> 0.8) @@ -905,7 +905,7 @@ DEPENDENCIES omniauth-facebook (~> 3.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) - omniauth-google-oauth2 (~> 0.2.0) + omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) omniauth-saml (~> 1.6.0) omniauth-shibboleth (~> 1.2.0) @@ -916,19 +916,19 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) - pry-rails + pry-rails (~> 0.3.4) rack-attack (~> 4.3.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) rails (= 4.2.6) rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) - rblineprof + rblineprof (~> 0.3.6) rdoc (~> 3.6) recaptcha (~> 3.0) redcarpet (~> 3.3.3) redis (~> 3.2) - redis-namespace + redis-namespace (~> 1.5.2) redis-rails (~> 4.0.0) request_store (~> 1.3.0) rerun (~> 0.11.0) @@ -936,7 +936,7 @@ DEPENDENCIES rouge (~> 1.11) rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) - rspec-retry + rspec-retry (~> 0.4.5) rubocop (~> 0.40.0) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) @@ -948,7 +948,7 @@ DEPENDENCIES select2-rails (~> 3.5.9) sentry-raven (~> 1.1.0) settingslogic (~> 2.0.9) - sham_rack + sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) sidekiq (~> 4.0) sidekiq-cron (~> 0.4.0) |