Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ce-gitlab-git-backport' into 'master' | Sean McGivern | 2017-11-06 | 1 | -16/+76 |
|\ | |||||
| * | Encapsulate git operations for mirroring in Gitlab::Git | Alejandro Rodríguez | 2017-11-03 | 1 | -16/+61 |
| * | Add `Gitlab::Git::Repository#fetch` command | Alejandro Rodríguez | 2017-11-03 | 1 | -0/+15 |
* | | Add TimeCop freeze for DST and Regular timefix/sm/39817-fix-cron_parser_spec-rb | Shinya Maeda | 2017-11-05 | 1 | -6/+42 |
|/ | |||||
* | Merge branch 'gitaly-ff-merge' into 'master' | Rémy Coutable | 2017-11-02 | 2 | -21/+73 |
|\ | |||||
| * | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-merge | Alejandro Rodríguez | 2017-10-31 | 2 | -21/+73 |
* | | Merge branch 'icons-ci-icons' into 'master' | Filipa Lacerda | 2017-11-02 | 15 | -23/+23 |
|\ \ | |||||
| * | | Fixes one icon test | Tim Zallmann | 2017-10-30 | 1 | -1/+1 |
| * | | Test Fixes | Tim Zallmann | 2017-10-30 | 2 | -2/+2 |
| * | | Fixes for Tests | Tim Zallmann | 2017-10-30 | 6 | -14/+14 |
| * | | Updated also Badge + Dropdown Icons | Tim Zallmann | 2017-10-30 | 9 | -9/+9 |
* | | | Merge branch 'dm-sidekiq-sigstp' into 'master' | Sean McGivern | 2017-11-02 | 1 | -0/+63 |
|\ \ \ | |||||
| * | | | Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when t...dm-sidekiq-sigstp | Douwe Maan | 2017-11-02 | 1 | -0/+63 |
* | | | | Merge branch 'dm-remove-private-token' into 'master' | Sean McGivern | 2017-11-02 | 1 | -7/+7 |
|\ \ \ \ | |||||
| * | | | | Add sudo API scope | Douwe Maan | 2017-11-02 | 1 | -2/+2 |
| * | | | | Consistently use PersonalAccessToken instead of PersonalToken | Douwe Maan | 2017-11-02 | 1 | -5/+5 |
* | | | | | Merge branch 'remove-readonly-exclusion-from-systemcheck' into 'master' | Douwe Maan | 2017-11-02 | 1 | -8/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove an exception from the git user default SSH config check | Nick Thomas | 2017-11-02 | 1 | -8/+0 |
* | | | | | | Merge branch 'jk-epic-changes-ce-port' into 'master' | Sean McGivern | 2017-11-02 | 6 | -0/+138 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 6 | -0/+138 |
| | |/ / / | |/| | | | |||||
* | | | | | Geo route whitelisting is too optimistic | Brett Walker | 2017-11-02 | 1 | -0/+26 |
| |/ / / |/| | | | |||||
* | | | | Fix encoding issue with Repository.ls_files | Kim Carlbäcker | 2017-11-02 | 1 | -0/+5 |
* | | | | Merge branch 'jej/lfs-change-detection' into 'master' | Douwe Maan | 2017-11-01 | 4 | -29/+179 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Detect changes to LFS pointers for pruning and integrity check | James Edwards-Jones | 2017-11-01 | 4 | -29/+179 |
* | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master' | Sean McGivern | 2017-11-01 | 1 | -20/+28 |
|\ \ \ \ | |||||
| * | | | | reword `targets` to `metric tags` | micael.bergeron | 2017-10-31 | 1 | -3/+3 |
| * | | | | add metrics tagging to the sidekiq middleware | micael.bergeron | 2017-10-31 | 1 | -20/+28 |
* | | | | | Merge branch 'backport-workhorse-show-all-refs' into 'master' | Douwe Maan | 2017-11-01 | 1 | -2/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Support show-all-refs for git over HTTP | Nick Thomas | 2017-10-30 | 1 | -2/+16 |
* | | | | | | Merge branch 'go-get-ssh' into 'master' | Douwe Maan | 2017-11-01 | 1 | -53/+85 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Returns a ssh url for go-get=1 | Guilherme Vieira | 2017-10-31 | 1 | -53/+85 |
* | | | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master' | Sean McGivern | 2017-10-31 | 4 | -7/+9 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Normalize LDAP DN when looking up identity | Douwe Maan | 2017-10-31 | 4 | -7/+9 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fix/import-issue-assignees' into 'master' | Sean McGivern | 2017-10-31 | 5 | -1/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fix spec failure | James Lopez | 2017-10-31 | 1 | -0/+3 |
| * | | | | | | fix specsfix/import-issue-assignees | James Lopez | 2017-10-31 | 3 | -7/+10 |
| * | | | | | | fix missing issue assignees | James Lopez | 2017-10-31 | 3 | -1/+15 |
* | | | | | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master' | Sean McGivern | 2017-10-31 | 1 | -0/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-test | Alejandro Rodríguez | 2017-10-30 | 1 | -0/+22 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'add-packagist-project-service' into 'master' | Kamil Trzciński | 2017-10-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Add Packagist project service | Matt Coleman | 2017-10-13 | 1 | -0/+1 |
* | | | | | | | Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses | Sean McGivern | 2017-10-30 | 1 | -2/+19 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Fix 500 error for old (somewhat) MRs | AlexWayfer | 2017-10-30 | 1 | -0/+37 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fetch the merged branches at once | Lin Jen-Shin (godfat) | 2017-10-27 | 2 | -0/+58 |
* | | | | | Merge branch 'fix/add-path-attr-to-wiki-file' into 'master' | Sean McGivern | 2017-10-26 | 1 | -3/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Add path attribute to WikiFile class | Ahmad Sherif | 2017-10-26 | 1 | -3/+7 |
* | | | | | | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fix | Alejandro Rodríguez | 2017-10-25 | 1 | -13/+15 |
|/ / / / / | |||||
* | | | | | Merge branch 'gitaly-ff-merge-preparation' into 'master' | Rémy Coutable | 2017-10-25 | 1 | -0/+54 |
|\ \ \ \ \ | |||||
| * | | | | | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparation | Alejandro Rodríguez | 2017-10-24 | 1 | -0/+54 |
* | | | | | | Merge branch 'gitaly-gl-username' into 'master' | Douwe Maan | 2017-10-24 | 3 | -17/+21 |
|\ \ \ \ \ \ |