diff options
| author | mfechner <mfechner@FreeBSD.org> | 2018-07-26 21:56:23 +0800 |
|---|---|---|
| committer | mfechner <mfechner@FreeBSD.org> | 2018-07-26 21:56:23 +0800 |
| commit | ab073e8e193c3e44a8358678427912be675f5178 (patch) | |
| tree | db9f5f9c5390e93646e57cc31a6b98d6f6daec78 /www/gitlab-ce/files | |
| parent | 0fd321b243fce270ddb18c5668ab940f5a62849c (diff) | |
| download | freebsd-ports-gnome-ab073e8e193c3e44a8358678427912be675f5178.tar.gz freebsd-ports-gnome-ab073e8e193c3e44a8358678427912be675f5178.tar.zst freebsd-ports-gnome-ab073e8e193c3e44a8358678427912be675f5178.zip | |
- Update to 11.1.1, for more details please check:
https://about.gitlab.com/2018/07/22/gitlab-11-1-released/
- Fixed a typo in config/gitlab.yml.example that was introduced by the prefix update.
Approved by: mentors (implicit)
Diffstat (limited to 'www/gitlab-ce/files')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 16 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 523782b272f4..adf0ed1fa102 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-06-21 15:14:17 UTC +--- Gemfile.orig 2018-07-20 09:55:24 UTC +++ Gemfile @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', gem_versions['default_value_for'] @@ -36,11 +36,10 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -@@ -299,96 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3' +@@ -299,95 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # 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 - @@ -74,7 +73,7 @@ - - gem 'database_cleaner', '~> 1.5.0' - gem 'factory_bot_rails', '~> 4.8.2' -- gem 'rspec-rails', '~> 3.6.0' +- gem 'rspec-rails', '~> 3.7.0' - gem 'rspec-retry', '~> 0.4.5' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' @@ -133,12 +132,3 @@ gem 'octokit', '~> 4.9' gem 'mail_room', '~> 0.9.1' -@@ -419,7 +334,7 @@ group :ed25519 do - end - - # Gitaly GRPC client --gem 'gitaly-proto', '~> 0.100.0', require: 'gitaly' -+gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' - gem 'grpc', '~> 1.11.0' - - # Locked until https://github.com/google/protobuf/issues/4210 is closed diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 65e61752490e..58721ec11848 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -36,7 +36,7 @@ - path: /home/git/gitlab-shell/ - hooks_path: /home/git/gitlab-shell/hooks/ + path: %%PREFIX%%/share/gitlab-shell/ -+ hooks_path: %%PREFIX/share/gitlab-shell/hooks/ ++ hooks_path: %%PREFIX%%/share/gitlab-shell/hooks/ # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). |