diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-04 14:46:24 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-04 14:46:24 +0000 |
| commit | e063c8f3e2c5faa8c92c898c4390e616e90926b0 (patch) | |
| tree | af5babe949f0209996b454a1819f0230ed0f03b1 | |
| parent | 971e57cffa6a89ebcd4da83efc4967f834f8f58b (diff) | |
| parent | 7af2fbbaf633a8073bd7c9f9993780659e3db263 (diff) | |
| download | gitlab-ce-e063c8f3e2c5faa8c92c898c4390e616e90926b0.tar.gz | |
Merge branch 'trigger_hooks_create_on_backup_restore' into 'master'
Trigger hooks create on backup restore
Number of users migrating from installation from source to omnibus get this issue. This can be fixed with a bash one liner but we already have a script that creates hooks in gitlab-shell. Added to gitlab:shell:install task call to `bin/create-hooks`. This script is idempotent which means it will only rewrite hooks if something changed.
Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2208, https://github.com/gitlabhq/gitlabhq/issues/9101 and for the most part https://github.com/gitlabhq/gitlabhq/issues/8161
See merge request !762
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/tasks/gitlab/shell.rake | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1fd938a34cd..a0b56bd3055 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,12 +38,13 @@ v 7.12.0 (unreleased) - User should be able to leave group. If not - show him proper message - User has ability to leave project - Add SAML support as an omniauth provider - - Allow to configure a URL to show after sign out + - Allow to configure a URL to show after sign out - Add an option to automatically sign-in with an Omniauth provider - Better performance for web editor (switched from satellites to rugged) - GitLab CI service sends .gitlab-ci.yaml in each push call - When remove project - move repository and schedule it removal - Improve group removing logic + - Trigger create-hooks on backup restore task v 7.11.4 - Fix missing bullets when creating lists diff --git a/lib/tasks/gitlab/shell.rake b/lib/tasks/gitlab/shell.rake index e835d6cb9b7..afdaba11cb0 100644 --- a/lib/tasks/gitlab/shell.rake +++ b/lib/tasks/gitlab/shell.rake @@ -59,6 +59,9 @@ namespace :gitlab do # Launch installation process system(*%W(bin/install)) + + # (Re)create hooks + system(*%W(bin/create-hooks)) end # Required for debian packaging with PKGR: Setup .ssh/environment with |