--- Gemfile.orig 2016-11-09 05:10:18 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.7.1' +gem 'rails', '>= 4.2.7.1' gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with @@ -8,15 +8,14 @@ gem 'responders', '~> 2.0' # Specify a sprockets version due to increased performance # See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069 -gem 'sprockets', '~> 3.6.0' +gem 'sprockets', '>= 3.6.0' gem 'sprockets-es6' # Default values for AR models -gem 'default_value_for', '~> 3.0.0' +gem 'default_value_for', '>= 3.0.0' # Supported DBs -gem 'mysql2', '~> 0.3.16', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '>= 0.18.2', group: :postgres # Authentication libraries gem 'devise', '~> 4.0' @@ -26,20 +25,19 @@ gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' -gem 'omniauth-facebook', '~> 3.0.0' +gem 'omniauth-facebook', '>= 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' -gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos -gem 'omniauth-saml', '~> 1.6.0' +gem 'omniauth-saml', '>= 1.6.0' gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' +gem 'omniauth-twitter', '>= 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' -gem 'rack-oauth2', '~> 1.2.1' +gem 'rack-oauth2', '>= 1.2.1' gem 'jwt' # Spam and anti-bot protection -gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' +gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' # Two-factor authentication @@ -66,21 +64,21 @@ gem 'gollum-lib', '~> 4.2', require: fal gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'github-linguist', '>= 4.7.0', require: 'linguist' # API -gem 'grape', '~> 0.15.0' -gem 'grape-entity', '~> 0.4.2' +gem 'grape', '>= 0.15.0' +gem 'grape-entity', '>= 0.4.2' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination gem 'kaminari', '~> 0.17.0' # HAML -gem 'hamlit', '~> 2.6.1' +gem 'hamlit', '>= 2.6.1' # Files attachments -gem 'carrierwave', '~> 0.10.0' +gem 'carrierwave', '>= 0.10.0' # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' @@ -107,25 +105,25 @@ gem 'seed-fu', '~> 2.3.5' gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' gem 'github-markup', '~> 1.4' -gem 'redcarpet', '~> 3.3.3' +gem 'redcarpet', '>= 3.3.3' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' +gem 'rdoc', '>= 3.6' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' -gem 'wikicloth', '0.8.1' +gem 'wikicloth', '>= 0.8.1' gem 'asciidoctor', '~> 1.5.2' gem 'rouge', '~> 2.0' # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM -gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' +gem 'nokogiri', '>= 1.6.7.2' # Diffs -gem 'diffy', '~> 3.0.3' +gem 'diffy', '>= 3.0.3' # Application server group :unicorn do - gem 'unicorn', '~> 4.9.0' + gem 'unicorn', '>= 4.9.0' gem 'unicorn-worker-killer', '~> 0.4.2' end @@ -144,7 +142,7 @@ gem 'sidekiq-cron', '~> 0.4.0' gem 'redis-namespace', '~> 1.5.2' # HTTP requests -gem 'httparty', '~> 0.13.3' +gem 'httparty', '>= 0.13.3' # Colored output to console gem 'rainbow', '~> 2.1.0' @@ -173,10 +171,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0. gem 'gemnasium-gitlab-service', '~> 0.2' # Slack integration -gem 'slack-notifier', '~> 1.2.0' +gem 'slack-notifier', '>= 1.2.0' # Asana integration -gem 'asana', '~> 0.4.0' +gem 'asana', '>= 0.4.0' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -188,17 +186,17 @@ gem 'd3_rails', '~> 3.5.0' gem 'underscore-rails', '~> 1.8.0' # Sanitize user input -gem 'sanitize', '~> 2.0' +gem 'sanitize', '>= 2.0' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input gem 'loofah', '~> 2.0.3' # Working with license -gem 'licensee', '~> 8.0.0' +gem 'licensee', '>= 8.0.0' # Protect against bruteforcing -gem 'rack-attack', '~> 4.3.1' +gem 'rack-attack', '>= 4.3.1' # Ace editor gem 'ace-rails-ap', '~> 4.1.0' @@ -215,125 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.0' gem 'coffee-rails', '~> 4.1.0' -gem 'uglifier', '~> 2.7.2' +gem 'uglifier', '>= 2.7.2' gem 'turbolinks', '~> 2.5.0' gem 'jquery-turbolinks', '~> 2.1.0' -gem 'addressable', '~> 2.3.8' +gem 'addressable', '>= 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' -gem 'font-awesome-rails', '~> 4.6.1' +gem 'font-awesome-rails', '>= 4.6.1' gem 'gemojione', '~> 3.0' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.1.0' +gem 'jquery-rails', '>= 4.1.0' gem 'jquery-ui-rails', '~> 5.0.0' -gem 'request_store', '~> 1.3.0' +gem 'request_store', '>= 1.3.0' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' -gem 'net-ssh', '~> 3.0.1' +gem 'net-ssh', '>= 3.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.0.0' +gem 'sentry-raven', '>= 2.0.0' gem 'premailer-rails', '~> 1.9.0' -# Metrics -group :metrics do - gem 'allocations', '~> 1.0', require: false, platform: :mri - gem 'method_source', '~> 0.8', require: false - gem 'influxdb', '~> 0.2', require: false -end - -group :development do - gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.3.0', require: false - - gem 'letter_opener_web', '~> 1.3.0' - gem 'rerun', '~> 0.11.0' - gem 'bullet', '~> 5.2.0', require: false - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - gem 'web-console', '~> 2.0' - - # Better errors handler - gem 'better_errors', '~> 1.0.1' - gem 'binding_of_caller', '~> 0.7.2' - - # Docs generator - gem 'sdoc', '~> 0.3.20' - - # thin instead webrick - gem 'thin', '~> 1.7.0' -end - -group :development, :test do - gem 'byebug', '~> 8.2.1', platform: :mri - gem 'pry-rails', '~> 0.3.4' - - gem 'awesome_print', '~> 1.2.0', require: false - gem 'fuubar', '~> 2.0.0' - - gem 'database_cleaner', '~> 1.5.0' - gem 'factory_girl_rails', '~> 4.6.0' - gem 'rspec-rails', '~> 3.5.0' - gem 'rspec-retry', '~> 0.4.5' - gem 'spinach-rails', '~> 0.2.1' - gem 'spinach-rerun-reporter', '~> 0.0.2' - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.7.0' - - # Generate Fake data - gem 'ffaker', '~> 2.0.0' - - gem 'capybara', '~> 2.6.2' - gem 'capybara-screenshot', '~> 1.0.0' - gem 'poltergeist', '~> 1.9.0' - - gem 'teaspoon', '~> 1.1.0' - gem 'teaspoon-jasmine', '~> 2.2.0' - - gem 'spring', '~> 1.7.0' - gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-teaspoon', '~> 0.0.2' - - gem 'rubocop', '~> 0.41.2', require: false - gem 'rubocop-rspec', '~> 1.5.0', require: false - gem 'scss_lint', '~> 0.47.0', require: false - gem 'simplecov', '0.12.0', require: false - gem 'flog', '~> 4.3.2', require: false - gem 'flay', '~> 2.6.1', require: false - gem 'bundler-audit', '~> 0.5.0', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'license_finder', '~> 2.1.0', require: false - gem 'knapsack', '~> 1.11.0' -end - -group :test do - gem 'shoulda-matchers', '~> 2.8.0', require: false - gem 'email_spec', '~> 1.6.0' - gem 'json-schema', '~> 2.6.2' - gem 'webmock', '~> 1.21.0' - gem 'test_after_commit', '~> 0.4.2' - gem 'sham_rack', '~> 1.3.6' -end - group :production do gem 'gitlab_meta', '7.0' end gem 'newrelic_rpm', '~> 3.16' -gem 'octokit', '~> 4.3.0' +gem 'octokit', '>= 4.3.0' gem 'mail_room', '~> 0.8' gem 'email_reply_parser', '~> 0.5.8' -gem 'ruby-prof', '~> 0.15.9' +gem 'ruby-prof', '>= 0.15.9' ## CI gem 'activerecord-session_store', '~> 1.0.0' @@ -346,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' gem 'paranoia', '~> 2.0' # Health check -gem 'health_check', '~> 2.1.0' +gem 'health_check', '>= 2.1.0' # System information -gem 'vmstat', '~> 2.2' +gem 'vmstat', '>= 2.1.1' gem 'sys-filesystem', '~> 1.1.6' + +gem 'rinku'