Changeset View
Changeset View
Standalone View
Standalone View
head/www/gitlab/files/patch-Gemfile
| --- Gemfile.orig 2018-04-03 16:35:11 UTC | --- Gemfile.orig 2018-04-09 20:57:26 UTC | ||||
| +++ Gemfile | +++ Gemfile | ||||
| @@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0' | @@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0' | ||||
| gem 'default_value_for', '~> 3.0.0' | gem 'default_value_for', '~> 3.0.0' | ||||
| # Supported DBs | # Supported DBs | ||||
| -gem 'mysql2', '~> 0.4.10', group: :mysql | -gem 'mysql2', '~> 0.4.10', group: :mysql | ||||
| +gem 'mysql2', '>= 0.4.10', group: :mysql | +gem 'mysql2', '>= 0.4.10', group: :mysql | ||||
| gem 'pg', '~> 0.18.2', group: :postgres | gem 'pg', '~> 0.18.2', group: :postgres | ||||
| gem 'rugged', '~> 0.26.0' | gem 'rugged', '~> 0.26.0' | ||||
| @@ -113,7 +113,7 @@ gem 'fog-rackspace', '~> 0.1.1' | @@ -113,7 +113,7 @@ gem 'fog-rackspace', '~> 0.1.1' | ||||
| gem 'fog-aliyun', '~> 0.2.0' | gem 'fog-aliyun', '~> 0.2.0' | ||||
| # for Google storage | # for Google storage | ||||
| -gem 'google-api-client', '~> 0.13.6' | -gem 'google-api-client', '~> 0.13.6' | ||||
| +gem 'google-api-client', '>= 0.13.6' | +gem 'google-api-client', '>= 0.13.6' | ||||
| # for aws storage | # for aws storage | ||||
| gem 'unf', '~> 0.1.4' | gem 'unf', '~> 0.1.4' | ||||
| @@ -148,7 +148,7 @@ group :unicorn do | @@ -149,7 +149,7 @@ group :unicorn do | ||||
| end | end | ||||
| # State machine | # State machine | ||||
| -gem 'state_machines-activerecord', '~> 0.4.0' | -gem 'state_machines-activerecord', '~> 0.4.0' | ||||
| +gem 'state_machines-activerecord', '>= 0.4.0' | +gem 'state_machines-activerecord', '>= 0.4.0' | ||||
| # Issue tags | # Issue tags | ||||
| gem 'acts-as-taggable-on', '~> 4.0' | gem 'acts-as-taggable-on', '~> 4.0' | ||||
| @@ -163,7 +163,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req | @@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req | ||||
| gem 'rufus-scheduler', '~> 3.4' | gem 'rufus-scheduler', '~> 3.4' | ||||
| # HTTP requests | # HTTP requests | ||||
| -gem 'httparty', '~> 0.13.3' | -gem 'httparty', '~> 0.13.3' | ||||
| +gem 'httparty', '>= 0.13.3' | +gem 'httparty', '>= 0.13.3' | ||||
| # Colored output to console | # Colored output to console | ||||
| gem 'rainbow', '~> 2.2' | gem 'rainbow', '~> 2.2' | ||||
| @@ -213,11 +213,11 @@ gem 'kubeclient', '~> 2.2.0' | @@ -214,7 +214,7 @@ gem 'kubeclient', '~> 2.2.0' | ||||
| gem 'd3_rails', '~> 3.5.0' | gem 'd3_rails', '~> 3.5.0' | ||||
| # Sanitize user input | # Sanitize user input | ||||
| -gem 'sanitize', '~> 2.0' | -gem 'sanitize', '~> 2.0' | ||||
| +gem 'sanitize', '>= 2.0' | +gem 'sanitize', '>= 2.0' | ||||
| gem 'babosa', '~> 1.0.2' | gem 'babosa', '~> 1.0.2' | ||||
| # Sanitizes SVG input | # Sanitizes SVG input | ||||
| -gem 'loofah', '~> 2.0.3' | @@ -264,7 +264,7 @@ gem 'virtus', '~> 1.0.1' | ||||
| +gem 'loofah', '>= 2.0.3' | gem 'base32', '~> 0.3.0' | ||||
| # Working with license | # Sentry integration | ||||
| gem 'licensee', '~> 8.7.0' | -gem 'sentry-raven', '~> 2.5.3' | ||||
| @@ -280,7 +280,7 @@ gem 'batch-loader', '~> 1.2.1' | +gem 'sentry-raven', '>= 2.5.3' | ||||
| gem 'premailer-rails', '~> 1.9.7' | |||||
| @@ -281,7 +281,7 @@ gem 'batch-loader', '~> 1.2.1' | |||||
| gem 'peek', '~> 1.0.1' | gem 'peek', '~> 1.0.1' | ||||
| gem 'peek-gc', '~> 0.0.2' | gem 'peek-gc', '~> 0.0.2' | ||||
| gem 'peek-host', '~> 1.0.0' | gem 'peek-host', '~> 1.0.0' | ||||
| -gem 'peek-mysql2', '~> 1.1.0', group: :mysql | -gem 'peek-mysql2', '~> 1.1.0', group: :mysql | ||||
| +gem 'peek-mysql2', '>= 1.1.0', group: :mysql | +gem 'peek-mysql2', '>= 1.1.0', group: :mysql | ||||
| gem 'peek-performance_bar', '~> 1.3.0' | gem 'peek-performance_bar', '~> 1.3.0' | ||||
| gem 'peek-pg', '~> 1.3.0', group: :postgres | gem 'peek-pg', '~> 1.3.0', group: :postgres | ||||
| gem 'peek-rblineprof', '~> 0.2.0' | gem 'peek-rblineprof', '~> 0.2.0' | ||||
| @@ -289,97 +289,11 @@ gem 'peek-sidekiq', '~> 1.0.3' | @@ -290,97 +290,11 @@ gem 'peek-sidekiq', '~> 1.0.3' | ||||
| # Metrics | # Metrics | ||||
| group :metrics do | group :metrics do | ||||
| - gem 'allocations', '~> 1.0', require: false, platform: :mri | - gem 'allocations', '~> 1.0', require: false, platform: :mri | ||||
| - gem 'method_source', '~> 0.8', require: false | - gem 'method_source', '~> 0.8', require: false | ||||
| - gem 'influxdb', '~> 0.2', require: false | - gem 'influxdb', '~> 0.2', require: false | ||||
| - | - | ||||
| # Prometheus | # Prometheus | ||||
| ▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Lines | |||||
| - gem 'timecop', '~> 0.8.0' | - gem 'timecop', '~> 0.8.0' | ||||
| - gem 'concurrent-ruby', '~> 1.0.5' | - gem 'concurrent-ruby', '~> 1.0.5' | ||||
| - gem 'test-prof', '~> 0.2.5' | - gem 'test-prof', '~> 0.2.5' | ||||
| -end | -end | ||||
| - | - | ||||
| gem 'octokit', '~> 4.6.2' | gem 'octokit', '~> 4.6.2' | ||||
| gem 'mail_room', '~> 0.9.1' | gem 'mail_room', '~> 0.9.1' | ||||
| @@ -427,3 +341,6 @@ gem 'grape_logging', '~> 1.7' | @@ -431,3 +345,6 @@ gem 'grape_logging', '~> 1.7' | ||||
| # Asset synchronization | # Asset synchronization | ||||
| gem 'asset_sync', '~> 2.2.0' | gem 'asset_sync', '~> 2.2.0' | ||||
| + | + | ||||
| +# Make sure this is always present, as it is missing upstream but is required | +# Make sure this is always present, as it is missing upstream but is required | ||||
| +gem 'rinku' | +gem 'rinku' | ||||