Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-03 | 46 | -230/+426 |
|\ | |||||
| * | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int... | Yorick Peterse | 2017-11-02 | 1 | -0/+1 |
| |\ | |||||
| | * | Set merge_request_diff_id on MR when creating | Sean McGivern | 2017-11-02 | 1 | -1/+1 |
| | * | Add a column linking an MR to its diff | Sean McGivern | 2017-11-02 | 1 | -0/+1 |
| * | | Merge branch 'gitaly-ff-merge' into 'master' | Rémy Coutable | 2017-11-02 | 3 | -9/+42 |
| |\ \ | |||||
| | * | | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-merge | Alejandro Rodríguez | 2017-10-31 | 3 | -9/+42 |
| * | | | Merge branch 'icons-ci-icons' into 'master' | Filipa Lacerda | 2017-11-02 | 14 | -14/+14 |
| |\ \ \ | |||||
| | * | | | Update Action Icons | Tim Zallmann | 2017-10-30 | 5 | -5/+5 |
| | * | | | 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 | -14/+27 |
| |\ \ \ \ | |||||
| | * | | | | Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when t...dm-sidekiq-sigstp | Douwe Maan | 2017-11-02 | 1 | -14/+27 |
| * | | | | | Merge branch 'dm-remove-private-token' into 'master' | Sean McGivern | 2017-11-02 | 9 | -140/+57 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update specs for sudo behavior | Douwe Maan | 2017-11-02 | 1 | -5/+2 |
| | * | | | | | Add sudo API scope | Douwe Maan | 2017-11-02 | 3 | -77/+55 |
| | * | | | | | Consistently use PersonalAccessToken instead of PersonalToken | Douwe Maan | 2017-11-02 | 1 | -4/+4 |
| | * | | | | | Remove authentication using user.private_token | Douwe Maan | 2017-11-02 | 1 | -16/+6 |
| | * | | | | | Remove tokens:reset_all_auth rake task | Douwe Maan | 2017-11-02 | 1 | -11/+1 |
| | * | | | | | Remove gitlab:users:clear_all_authentication_tokens rake task | Douwe Maan | 2017-11-02 | 1 | -11/+0 |
| | * | | | | | Remove private_token from API user entity | Douwe Maan | 2017-11-02 | 2 | -7/+1 |
| | * | | | | | Remove Session API | Douwe Maan | 2017-11-02 | 2 | -21/+0 |
| * | | | | | | Merge branch 'remove-readonly-exclusion-from-systemcheck' into 'master' | Douwe Maan | 2017-11-02 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove an exception from the git user default SSH config check | Nick Thomas | 2017-11-02 | 1 | -2/+2 |
| * | | | | | | | Merge branch 'jk-epic-changes-ce-port' into 'master' | Sean McGivern | 2017-11-02 | 3 | -11/+41 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 3 | -11/+41 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'zj-gitaly-migrate-metrics' into 'master' | Sean McGivern | 2017-11-02 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Measure Gitaly migration sites against original | Zeger-Jan van de Weg | 2017-11-01 | 1 | -1/+5 |
| * | | | | | | | Geo route whitelisting is too optimistic | Brett Walker | 2017-11-02 | 1 | -2/+3 |
| | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Fix encoding issue with Repository.ls_files | Kim Carlbäcker | 2017-11-02 | 1 | -1/+1 |
| * | | | | | | Merge branch 'jej/lfs-change-detection' into 'master' | Douwe Maan | 2017-11-01 | 4 | -12/+134 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Detect changes to LFS pointers for pruning and integrity check | James Edwards-Jones | 2017-11-01 | 4 | -12/+134 |
| * | | | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master' | Sean McGivern | 2017-11-01 | 1 | -0/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | reword `targets` to `metric tags` | micael.bergeron | 2017-10-31 | 1 | -1/+1 |
| | * | | | | | | add metrics tagging to the sidekiq middleware | micael.bergeron | 2017-10-31 | 1 | -0/+2 |
| * | | | | | | | Merge branch 'backport-workhorse-show-all-refs' into 'master' | Douwe Maan | 2017-11-01 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Support show-all-refs for git over HTTP | Nick Thomas | 2017-10-30 | 1 | -2/+3 |
| * | | | | | | | | Merge branch '39628-bug-in-the-procedure-advised-from-ee_compat_check' into '... | Sean McGivern | 2017-11-01 | 2 | -15/+16 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Ensure the ee-compat-check uses the correct patch URL for forks39628-bug-in-the-procedure-advised-from-ee_compat_check | Rémy Coutable | 2017-10-31 | 2 | -15/+16 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master' | Sean McGivern | 2017-11-01 | 3 | -5/+65 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitaly | Ahmad Sherif | 2017-10-31 | 3 | -5/+65 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'go-get-ssh' into 'master' | Douwe Maan | 2017-11-01 | 1 | -2/+13 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Returns a ssh url for go-get=1 | Guilherme Vieira | 2017-10-31 | 1 | -2/+13 |
* | | | | | | | | | General cleanup | Alessio Caiazza | 2017-11-02 | 1 | -11/+15 |
* | | | | | | | | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-02 | 77 | -420/+1359 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 2 | -5/+5 |
| * | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 36 | -73/+494 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-31 | 3 | -7/+82 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitaly | Ahmad Sherif | 2017-10-31 | 3 | -7/+82 |
| | * | | | | | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master' | Sean McGivern | 2017-10-31 | 2 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Normalize LDAP DN when looking up identity | Douwe Maan | 2017-10-31 | 2 | -3/+4 |
| | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master' | Sean McGivern | 2017-10-31 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | |