diff options
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index e4180cc3ef2b..dcdaa6e4beff 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2016-11-09 05:10:18 UTC +--- Gemfile.orig 2016-12-14 20:07:13 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' @@ -27,12 +27,7 @@ # 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' +@@ -30,16 +29,15 @@ gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' @@ -53,7 +48,16 @@ gem 'akismet', '~> 2.0' # Two-factor authentication -@@ -66,21 +64,21 @@ gem 'gollum-lib', '~> 4.2', require: fal +@@ -53,7 +51,7 @@ gem 'browser', '~> 2.2' + + # Extracting information from a git repository + # Provide access to Gitlab::Git library +-gem 'gitlab_git', '~> 10.6.6' ++gem 'gitlab_git', '>= 10.6.6' + + # LDAP Auth + # GitLab fork with several improvements to original library. For full list of changes +@@ -66,10 +64,10 @@ gem 'gollum-lib', '~> 4.2', require: fal gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection @@ -62,12 +66,11 @@ # API -gem 'grape', '~> 0.15.0' --gem 'grape-entity', '~> 0.4.2' +gem 'grape', '>= 0.15.0' -+gem 'grape-entity', '>= 0.4.2' + gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' - # Pagination +@@ -77,10 +75,10 @@ gem 'rack-cors', '~> 0.4.0', require: gem 'kaminari', '~> 0.17.0' # HAML @@ -80,10 +83,10 @@ # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' -@@ -107,25 +105,25 @@ gem 'seed-fu', '~> 2.3.5' +@@ -104,25 +102,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 'gitlab-markup', '~> 1.5.0' -gem 'redcarpet', '~> 3.3.3' +gem 'redcarpet', '>= 3.3.3' gem 'RedCloth', '~> 4.3.2' @@ -112,7 +115,7 @@ gem 'unicorn-worker-killer', '~> 0.4.2' end -@@ -144,7 +142,7 @@ gem 'sidekiq-cron', '~> 0.4.0' +@@ -141,7 +139,7 @@ gem 'sidekiq-cron', '~> 0.4.0' gem 'redis-namespace', '~> 1.5.2' # HTTP requests @@ -121,7 +124,7 @@ # Colored output to console gem 'rainbow', '~> 2.1.0' -@@ -173,10 +171,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0. +@@ -170,10 +168,10 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0. gem 'gemnasium-gitlab-service', '~> 0.2' # Slack integration @@ -134,7 +137,7 @@ # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' -@@ -188,17 +186,17 @@ gem 'd3_rails', '~> 3.5.0' +@@ -185,17 +183,17 @@ gem 'd3_rails', '~> 3.5.0' gem 'underscore-rails', '~> 1.8.0' # Sanitize user input @@ -155,7 +158,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -@@ -215,125 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' +@@ -215,127 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.0' gem 'coffee-rails', '~> 4.1.0' @@ -249,9 +252,10 @@ - gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-teaspoon', '~> 0.0.2' - -- gem 'rubocop', '~> 0.41.2', require: false +- gem 'rubocop', '~> 0.42.0', require: false - gem 'rubocop-rspec', '~> 1.5.0', require: false - gem 'scss_lint', '~> 0.47.0', require: false +- gem 'haml_lint', '~> 0.18.2', require: false - gem 'simplecov', '0.12.0', require: false - gem 'flog', '~> 4.3.2', require: false - gem 'flay', '~> 2.6.1', require: false @@ -270,6 +274,7 @@ - gem 'webmock', '~> 1.21.0' - gem 'test_after_commit', '~> 0.4.2' - gem 'sham_rack', '~> 1.3.6' +- gem 'timecop', '~> 0.8.0' -end - group :production do @@ -281,7 +286,7 @@ -gem 'octokit', '~> 4.3.0' +gem 'octokit', '>= 4.3.0' - gem 'mail_room', '~> 0.8' + gem 'mail_room', '~> 0.8.1' gem 'email_reply_parser', '~> 0.5.8' @@ -290,7 +295,7 @@ ## CI gem 'activerecord-session_store', '~> 1.0.0' -@@ -346,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' +@@ -348,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' gem 'paranoia', '~> 2.0' # Health check |