summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * custom_hook: chain custom hooksElan Ruusamäe2016-12-011-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | update hooks lookup to use <hook>.d/* from repository hooks dir the order would be: 1. <repository>.git/custom_hooks/<hook_name> - per project hook 2. <repository>.git/custom_hooks/<hook_name>.d/* - per project hooks 3. <repository>.git/hooks/<hook_name>.d/* - global hooks only executable files are matched and backup files excluded (*~) and the resulting list is sorted per each lookup
| * spec: add tests for global custom hooksDirk Hörner2016-12-013-15/+165
| |
| * custom_hook: add support for global custom hooksDirk Hörner2016-12-015-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the option of having another set of global custom hooks along with the already supported repository local custom hooks. The repository local custom hook is executed first (if available). If successful, execution continues with the global custom hook (if available). This way, local custom hooks get priority over global custom hooks. Global custom hooks can be enabled by placing an executable file into the "custom_hooks" directory within gitlab-shell (create if it does not exist, yet).
| * custom_hook: refactor to pull repo_path into classDirk Hörner2016-12-015-14/+15
| | | | | | | | | | | | This commit takes the GitlabCustomHook a bit clother to the other hook handling classes by receiving the repo_path as argument to initialize() instead of passing it to each method.
| * custom_hook: only execute hook if file is executableDirk Hörner2016-12-011-1/+1
|/ | | | | This commit fixes an issue where an existing but unexecutable hook would cause an uncaught execption.
* Bump version to 4.0.3v4.0.3Douwe Maan2016-12-011-1/+1
|
* Merge branch 'add-prune-option-to-fetch-command' into 'master' Douwe Maan2016-12-012-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch repositories with --prune option by default. This will allow us to not recreate branches that has been deleted on the upstream and the mirror. Related issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/1277 I've reviewed the code for updating local and remote mirrors also I've manually tested these features and all looks good. Here is the description of the `--prune` option: >>> --prune Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to >>> @brodock do you see any issues when fetching repos for GitLab Geo? See merge request !110
| * Fetch repositories with --prune option by default.add-prune-option-to-fetch-commandRuben Davila2016-11-292-0/+3
|/ | | | This will allow us to not recreate branches that has been deleted on the upstream and the mirror.
* Bumped version to 4.0.2v4.0.2Yorick Peterse2016-11-171-1/+1
|
* Merge branch ↵Yorick Peterse2016-11-172-0/+4
|\ | | | | | | | | | | | | | | '70-push-fails-because-of-missing-dependencies-on-gitlab_custom_hooks' into 'master' Fix gitlab_custom_hook dependencies See merge request !107
| * Fix gitlab_custom_hook dependencies70-push-fails-because-of-missing-dependencies-on-gitlab_custom_hooksAlejandro Rodríguez2016-11-162-0/+4
|/
* Bump version to 4.0.1v4.0.1Yorick Peterse2016-11-161-1/+1
|
* Merge branch 'more-instrumentation-down-the-pipeline' into 'master' Yorick Peterse2016-11-164-6/+18
|\ | | | | | | | | Add instrumentation to push hooks See merge request !106
| * Add a CHANGELOG entryAhmad Sherif2016-11-161-0/+3
| |
| * Add instrumentation to push hooksmore-instrumentation-down-the-pipelineAhmad Sherif2016-11-163-6/+15
|/ | | | Related to #22053
* Release 4.0.0v4.0.0Dmitriy Zaporozhets2016-10-311-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'dz-support-nested-namespaces' into 'master' Dmitriy Zaporozhets2016-10-298-30/+16
|\ | | | | | | | | | | | | | | | | Use full repository path instead of extracting name In order to implement nested groups https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 we can not rely on old path with one slash that split namespace and project name like `namespace/project.git`. Now it can be both `namespace/project.git` and `namespace/namespace/namespace/project.git`. Because of that it makes no sense to extract part of full path. Instead we just pass path to API without change and let rails application do parsing/extraction. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !102
| * Use full repository path for API calls instead of extracting namedz-support-nested-namespacesDmitriy Zaporozhets2016-10-278-30/+16
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'remove_lfs_remark' into 'master' Marin Jankovski2016-10-131-26/+1
|\ | | | | | | | | Git LFS remark in readme is no longer correct. See merge request !101
| * Git LFS remark in readme is no longer correct.remove_lfs_remarkMarin Jankovski2016-10-121-26/+1
| |
* | Release 3.6.6v3.6.6Yorick Peterse2016-10-121-1/+1
| |
* | Merge branch 'reuse-logger' into 'master' Marin Jankovski2016-10-123-10/+10
|\ \ | |/ |/| | | | | | | | | Re-use the default logger for performance metrics See #64 for the discussion leading up to this. See merge request !100
| * Re-use the default logger for performance metricsYorick Peterse2016-10-123-10/+10
|/ | | | | | | This removes the need for configuring anything extra. To make scraping easier each line is prefixed by "metrics:". Fixes #64
* Release 3.6.5v3.6.5Yorick Peterse2016-10-111-1/+1
|
* Merge branch '62-instrument-gitlab-shell' into 'master' Yorick Peterse2016-10-119-37/+158
|\ | | | | | | | | Instrument GitLab Shell and log metrics data to a file See merge request !98
| * Instrument GitLab Shell and log metrics data to a filePaco Guzman2016-10-119-37/+158
|/
* Merge branch '61-ruby-23' into 'master' Sean McGivern2016-10-102-7/+10
|\ | | | | | | | | | | | | Test against ruby 2.3 Closes #61 See merge request !99
| * Test against ruby 2.3Paco Guzman2016-10-102-7/+10
|/
* Release 3.6.4v3.6.4Yorick Peterse2016-10-071-1/+1
|
* Merge branch 'fix-ionice-again' into 'master' Yorick Peterse2016-10-073-9/+11
|\ | | | | | | | | Fix rsync with ionice command building See merge request !97
| * Fix rsync with ionice command buildingAlejandro Rodríguez2016-10-073-9/+11
|/
* Merge branch 'fix-ionice' into 'master' Yorick Peterse2016-10-053-1/+41
|\ | | | | | | | | Fix short circuit logic between rsync with and without ionice for storage migrations See merge request !96
| * Fix short circuit logic between rsync with and without ionice forAlejandro Rodríguez2016-10-053-1/+41
|/ | | | storage migrations
* Merge branch 'add_gl_id' into 'master' Sean McGivern2016-10-057-7/+52
|\ | | | | | | | | | | | | | | Re-exposing GL_ID to custom hooks closes https://gitlab.com/gitlab-org/gitlab-ee/issues/995 closes https://gitlab.com/gitlab-org/gitlab-shell/issues/53 See merge request !95
| * added GL_IDadd_gl_idValery Sizov2016-10-057-7/+52
| |
* | Merge branch 'bump-version-3.6.2' into 'master' v3.6.3Rémy Coutable2016-09-301-1/+1
|\ \ | |/ |/| | | | | | | | | Update VERSION Was this an oversight? Should we re-tag v3.6.2? Or just bump to v3.6.3? See merge request !94
| * Update VERSION to 3.6.3 since 3.6.2 was already taggedLin Jen-Shin (godfat)2016-09-301-1/+1
| |
| * Update VERSIONbump-version-3.6.2Lin Jen-Shin (godfat)2016-09-301-1/+1
|/
* Merge branch '59-git-tracing' into 'master' v3.6.2Rémy Coutable2016-09-275-1/+107
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable GIT_TRACE_PERFORMANCE through a config variable. The value of the variable must an absolute path needs to exist so we’re able to check if we can write in that file. Because in the case we cannot write we’ll throw a warning to the output of the users. ```sh ~/dev/gitlab/local/pacoguzman/gitlab-ce (master=)$ git push origin master warning: could not open '/wadus' for tracing: Permission denied Everything up-to-date ``` Closes #59 See merge request !91
| * Enable GIT_TRACE/GIT_TRACE_PACKET/GIT_TRACE_PERFORMANCE by providing the ↵59-git-tracingPaco Guzman2016-09-275-1/+107
|/ | | | | | git_trace_log_file config key The value of the variable if present must be a writable absolute path. If it’s not the case we log a proper message and not enable tracing to not throw output to the users.
* Version 3.6.1v3.6.1Douwe Maan2016-09-261-1/+1
|
* Merge branch 'ionice-mv' into 'master' Yorick Peterse2016-09-233-1/+17
|\ | | | | | | | | Set a low IO priority for storage moves to lower performance impact See merge request !92
| * Set a low IO priority for storage moves to lower performance impactionice-mvAlejandro Rodríguez2016-09-203-1/+17
|/
* Bump version to 3.6.0v3.6.0Douwe Maan2016-09-202-2/+4
|
* Merge branch 'lfs-authenticate-support' into 'master' Douwe Maan2016-09-208-5/+191
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LFS support to SSH Required changes to GitLab Shell include the actual handling of the `git-lfs-authenticate` command and the retrieval of the correct credentials. Needed for gitlab-org/gitlab-ce!6043 Related to gitlab-org/gitlab-ce#3589 > **Note:** gitlab-org/gitlab-ce!6043 needs to be merged before this one. cc @jacobvosmaer-gitlab @marin @DouweM See merge request !86
| * Properly rescue from JSON parse.lfs-authenticate-supportPatricio Cano2016-09-081-2/+6
| |
| * Style fixes and better tests.Patricio Cano2016-09-064-10/+25
| |
| * Refactored LFS auth logic to use its own API endpoint.Patricio Cano2016-09-0611-28/+107
| |
| * Added test for old Git LFS clients that submit an extra :oid argument to ↵Patricio Cano2016-09-061-0/+13
| | | | | | | | `git-lfs-authenticate`
| * Refactored JSON header generation to its own class and added tests for itPatricio Cano2016-09-063-10/+45
| |
View Lorry Controller Status