We should be able to update minor versions of stable libs without breaking gitlab Gemfile Index: gitlab/Gemfile =================================================================== --- gitlab.orig/Gemfile +++ gitlab/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem 'rails', '4.2.6' -gem 'rails-deprecated_sanitizer', '~> 1.0.3' +gem 'rails-deprecated_sanitizer', '~> 1.0', '>= 1.0.3' # Responders respond_to and respond_with gem 'responders', '~> 2.0' @@ -11,31 +11,31 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.3' # Default values for AR models -gem "default_value_for", "~> 3.0.0" +gem "default_value_for", "~> 3.0" # Supported DBs gem "mysql2", '~> 0.3.16', group: :mysql gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 3.5.4' +gem 'devise', '~> 3.5', '>= 3.5.4' gem 'doorkeeper', '~> 3.1' gem 'devise-async', '~> 0.9.0' -gem 'omniauth', '~> 1.3.1' -gem 'omniauth-auth0', '~> 1.4.1' +gem 'omniauth', '~> 1.3', '>= 1.3.1' +gem 'omniauth-auth0', '~> 1.4', '>= 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-github', '~> 1.1.1' -gem 'omniauth-gitlab', '~> 1.0.0' +gem 'omniauth-cas3', '~> 1.1', '>= 1.1.2' +gem 'omniauth-facebook', '~> 3.0' +gem 'omniauth-github', '~> 1.1', '>= 1.1.1' +gem 'omniauth-gitlab', '~> 1.0' gem 'omniauth-google-oauth2', '~> 0.2.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos -gem 'omniauth-saml', '~> 1.5.0' -gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' -gem 'omniauth_crowd', '~> 2.2.0' -gem 'rack-oauth2', '~> 1.2.1' +gem 'omniauth-saml', '~> 1.5' +gem 'omniauth-shibboleth', '~> 1.2' +gem 'omniauth-twitter', '~> 1.2' +gem 'omniauth_crowd', '~> 2.2' +gem 'rack-oauth2', '~> 1.2', '>= 1.2.1' gem 'jwt' # Spam and anti-bot protection @@ -43,12 +43,12 @@ gem 'recaptcha', require: 'recaptcha/rai gem 'akismet', '~> 2.0' # Two-factor authentication -gem 'devise-two-factor', '~> 2.0.0' +gem 'devise-two-factor', '~> 2.0' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 1.3.4' +gem 'attr_encrypted', '~> 1.3', '>= 1.3.4' # Browser detection -gem "browser", '~> 1.0.0' +gem "browser", '~> 1.0' # Extracting information from a git repository # Provide access to Gitlab::Git library @@ -61,11 +61,11 @@ gem 'omniauth-ldap', '~> 1.0.4', require # Git Wiki # Required manually in config/initializers/gollum.rb to control load order -gem 'gollum-lib', '~> 4.1.0', require: false +gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection -gem "github-linguist", "~> 4.7.0", require: "linguist" +gem "github-linguist", "~> 4.7", require: "linguist" # API gem 'grape', '~> 0.13.0' @@ -92,31 +92,31 @@ gem "unf", '~> 0.1.4' gem "six", '~> 0.2.0' # Seed data -gem "seed-fu", '~> 2.3.5' +gem "seed-fu", '~> 2.3' # Markdown and HTML processing -gem 'html-pipeline', '~> 1.11.0' -gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'github-markup', '~> 1.3.1' -gem 'redcarpet', '~> 3.3.3' -gem 'RedCloth', '~> 4.2.9' +gem 'html-pipeline', '~> 1.11' +gem 'task_list', '~> 1.0', '>= 1.0.2', require: 'task_list/railtie' +gem 'github-markup', '~> 1.3' +gem 'redcarpet', '~> 3.3', '>= 3.3.3' +gem 'RedCloth', '~> 4.2', '>= 4.2.9' gem 'rdoc', '~> 4.1' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' -gem 'rouge', '~> 1.10.1' +gem 'asciidoctor', '~> 1.5', '>= 1.5.2' +gem 'rouge', '~> 1.10', '>= 1.10.1' # 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', '>= 1.6.7.2' # Diffs -gem 'diffy', '~> 3.0.3' +gem 'diffy', '~> 3.0', '>= 3.0.3' # Application server group :unicorn do - gem "unicorn", '~> 4.9.0' + gem "unicorn", '~> 4.9' gem 'unicorn-worker-killer', '~> 0.4.2' end @@ -129,7 +129,7 @@ gem 'after_commit_queue' gem 'acts-as-taggable-on', '~> 3.4' # Background jobs -gem 'sinatra', '~> 1.4.4', require: nil +gem 'sinatra', '~> 1.4', '>= 1.4.4', require: nil gem 'sidekiq', '~> 4.0' gem 'sidekiq-cron', '~> 0.4.0' gem 'redis-namespace' @@ -141,33 +141,33 @@ gem "httparty", '~> 0.13.3' gem "colorize", '~> 0.7.0' # GitLab settings -gem 'settingslogic', '~> 2.0.9' +gem 'settingslogic', '~> 2.0', '>= 2.0.9' # Misc -gem 'version_sorter', '~> 2.0.0' +gem 'version_sorter', '~> 2.0' # Cache -gem "redis-rails", '~> 4.0.0' +gem "redis-rails", '~> 4.0' # Redis gem 'redis', '~> 3.2' gem 'connection_pool', '~> 2.0' # Campfire integration -gem 'tinder', '~> 1.10.0' +gem 'tinder', '~> 1.10' # HipChat integration -gem 'hipchat', '~> 1.5.0' +gem 'hipchat', '~> 1.5' # Flowdock integration -gem "gitlab-flowdock-git-hook", "~> 1.0.1" +gem "gitlab-flowdock-git-hook", "~> 1.0", ">= 1.0.1" # Gemnasium integration gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration -gem "slack-notifier", "~> 1.2.0" +gem "slack-notifier", "~> 1.2" # Asana integration gem 'asana', '~> 0.4.0' @@ -176,61 +176,61 @@ gem 'asana', '~> 0.4.0' gem 'ruby-fogbugz', '~> 0.2.1' # d3 -gem 'd3_rails', '~> 3.5.0' +gem 'd3_rails', '~> 3.5' #cal-heatmap -gem 'cal-heatmap-rails', '~> 3.6.0' +gem 'cal-heatmap-rails', '~> 3.6' # underscore-rails -gem "underscore-rails", "~> 1.8.0" +gem "underscore-rails", "~> 1.8" # Sanitize user input gem "sanitize", '~> 2.0' -gem 'babosa', '~> 1.0.2' +gem 'babosa', '~> 1.0', '>= 1.0.2' # Sanitizes SVG input -gem "loofah", "~> 2.0.3" +gem "loofah", "~> 2.0", ">= 2.0.3" # Working with license -gem 'licensee', '~> 8.0.0' +gem 'licensee', '~> 8.0' # Protect against bruteforcing -gem "rack-attack", '~> 4.3.1' +gem "rack-attack", '~> 4.3', '>= 4.3.1' # Ace editor -gem 'ace-rails-ap', '~> 4.0.2' +gem 'ace-rails-ap', '~> 4.0', '>= 4.0.2' # Keyboard shortcuts -gem 'mousetrap-rails', '~> 1.4.6' +gem 'mousetrap-rails', '~> 1.4', '1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.3' -gem "sass-rails", '~> 5.0.0' -gem "coffee-rails", '~> 4.1.0' -gem "uglifier", '~> 2.7.2' -gem 'turbolinks', '~> 2.5.0' -gem 'jquery-turbolinks', '~> 2.1.0' +gem "sass-rails", '~> 5.0' +gem "coffee-rails", '~> 4.1' +gem "uglifier", '~> 2.7', '>= 2.7.2' +gem 'turbolinks', '~> 2.5' +gem 'jquery-turbolinks', '~> 2.1' -gem 'addressable', '~> 2.3.8' -gem 'bootstrap-sass', '~> 3.3.0' +gem 'addressable', '~> 2.3', '>= 2.3.8' +gem 'bootstrap-sass', '~> 3.3' gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.3.0' -gem 'gon', '~> 6.0.1' -gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.1.0' -gem 'jquery-ui-rails', '~> 5.0.0' -gem 'raphael-rails', '~> 2.1.2' -gem 'request_store', '~> 1.3.0' -gem 'select2-rails', '~> 3.5.9' -gem 'virtus', '~> 1.0.1' -gem 'net-ssh', '~> 3.0.1' +gem 'gon', '~> 6.0', '>= 6.0.1' +gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2' +gem 'jquery-rails', '~> 4.0' +gem 'jquery-ui-rails', '~> 5.0' +gem 'raphael-rails', '~> 2.1', '>= 2.1.2' +gem 'request_store', '~> 1.3' +gem 'select2-rails', '~> 3.5', '>= 3.5.9' +gem 'virtus', '~> 1.0', '>= 1.0.1' +gem 'net-ssh', '~> 3.0', '>= 3.0.1' gem 'base32', '~> 0.3.0' # Sentry integration gem 'sentry-raven', '~> 0.15' -gem 'premailer-rails', '~> 1.9.0' +gem 'premailer-rails', '~> 1.9', '>= 1.9.0' # Metrics group :metrics do @@ -318,7 +318,7 @@ end gem "newrelic_rpm", '~> 3.14' -gem 'octokit', '~> 4.3.0' +gem 'octokit', '~> 4.3' gem "mail_room", "~> 0.7" @@ -329,10 +329,10 @@ gem 'activerecord-session_store', '~> 0. gem "nested_form", '~> 0.3.2' # OAuth -gem 'oauth2', '~> 1.0.0' +gem 'oauth2', '~> 1.0' # Soft deletion gem "paranoia", "~> 2.0" # Health check -gem 'health_check', '~> 1.5.1' +gem 'health_check', '~> 1.5', '>= 1.5.1'