Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve "Helpful and instructing Empty state for multi file editor" | Tim Zallmann | 2018-01-05 | 2 | -4/+6 |
* | Merge branch 'dm-copy-mermaid-as-gfm' into 'master' | Jacob Schatz | 2018-01-05 | 3 | -3/+99 |
|\ | |||||
| * | Copy Mermaid graphs as GFMdm-copy-mermaid-as-gfm | Douwe Maan | 2018-01-05 | 3 | -3/+99 |
* | | Use --left-right and --max-count for counting diverging commits | Lin Jen-Shin (godfat) | 2018-01-05 | 2 | -1/+48 |
* | | Merge branch 'ce-backport=reorder-issues' into 'master' | Sean McGivern | 2018-01-05 | 10 | -54/+32 |
|\ \ | |||||
| * | | Refactor matchers for background migrationsce-backport=reorder-issues | Jarka Kadlecová | 2018-01-05 | 10 | -54/+32 |
* | | | API: get participants from merge_requests & issues | Brent Greeff | 2018-01-05 | 3 | -0/+47 |
* | | | Merge branch 'jprovazn-rebase' into 'master' | Filipa Lacerda | 2018-01-05 | 11 | -7/+480 |
|\ \ \ | |||||
| * | | | Backport 'Rebase' feature from EE to CEjprovazn-rebase | Jan Provaznik | 2018-01-05 | 11 | -7/+480 |
| |/ / | |||||
* | | | Merge branch 'remove-project-repo' into 'master' | Sean McGivern | 2018-01-05 | 5 | -11/+15 |
|\ \ \ | |||||
| * | | | Fix specsremove-project-repo | Jacob Vosmaer | 2018-01-05 | 5 | -11/+15 |
* | | | | Merge branch 'api-domains-expose-project_id' into 'master' | Dmitriy Zaporozhets | 2018-01-05 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Expose project_id on /api/v4/pages/domains | Luc Didry | 2018-01-03 | 2 | -1/+3 |
* | | | | | Merge branch 'backport-issue_3413' into 'master' | Sean McGivern | 2018-01-05 | 6 | -168/+293 |
|\ \ \ \ \ | |||||
| * | | | | | EE-BACKPORT group boards | Felipe Artur | 2018-01-04 | 6 | -168/+293 |
| |/ / / / | |||||
* | | | | | Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master' | Tim Zallmann | 2018-01-05 | 2 | -0/+42 |
|\ \ \ \ \ | |||||
| * | | | | | Backport of methods and components added in EBackport of methods and componen... | Filipa Lacerda | 2018-01-03 | 2 | -0/+42 |
* | | | | | | Merge branch 'jivl-fix-import-project-url-bug' into 'master' | Tim Zallmann | 2018-01-05 | 1 | -14/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix import project url not updating project namejivl-fix-import-project-url-bug | Jose Ivan Vargas | 2018-01-03 | 1 | -14/+18 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'winh-modal-target-id' into 'master' | Filipa Lacerda | 2018-01-05 | 4 | -23/+72 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add id to modal.vue to support data-toggle="modal" | Winnie Hellmann | 2018-01-05 | 4 | -23/+72 |
* | | | | | | | Merge branch 'refactor-cluster-show-page-conservative' into 'master' | Filipa Lacerda | 2018-01-05 | 2 | -7/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Match updated clusters/show in feature specs | Matija Čupić | 2017-12-21 | 2 | -7/+7 |
* | | | | | | | | Allow local tests to use a modified Gitaly | Jacob Vosmaer (GitLab) | 2018-01-05 | 1 | -0/+7 |
* | | | | | | | | Merge branch '40228-verify-integrity-of-repositories' into 'master' | Sean McGivern | 2018-01-05 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | refactor spec, add docs | James Lopez | 2018-01-04 | 1 | -8/+8 |
| * | | | | | | | | add lock specs | James Lopez | 2018-01-04 | 1 | -0/+13 |
| * | | | | | | | | add locks chek | James Lopez | 2018-01-04 | 1 | -1/+3 |
| * | | | | | | | | fix spec | James Lopez | 2018-01-04 | 1 | -9/+5 |
| * | | | | | | | | add new git fsck rake task and spec | James Lopez | 2018-01-04 | 1 | -0/+27 |
* | | | | | | | | | Merge branch 'zj-blob-batch' into 'master' | Douwe Maan | 2018-01-05 | 1 | -11/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Reroute batch blobs to single blob RPC | Zeger-Jan van de Weg | 2018-01-02 | 1 | -11/+4 |
* | | | | | | | | | | Merge branch 'ldap_username_attributes' into 'master' | Douwe Maan | 2018-01-05 | 3 | -5/+98 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Modify `LDAP::Person` to return username value based on attributes | Drew Blessing | 2018-01-04 | 3 | -5/+98 |
* | | | | | | | | | | Merge branch '41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly... | Stan Hu | 2018-01-05 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handler | Alejandro Rodríguez | 2018-01-04 | 1 | -0/+18 |
* | | | | | | | | | | | Create Kubernetes based on Application Templates | Mayra Cabrera | 2018-01-04 | 4 | -20/+82 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Added multi editor setting on the profile preferences page | Jose Ivan Vargas | 2018-01-04 | 3 | -1/+19 |
* | | | | | | | | | | Merge branch 'mdelaossa/gitlab-ce-31995-project-limit-default-fix' | Dmitriy Zaporozhets | 2018-01-04 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | User#projects_limit remove DB default and added NOT NULL constraint | Mario de la Ossa | 2017-12-30 | 1 | -0/+17 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'conditionally-eager-load-event-target-authors' into 'master' | Douwe Maan | 2018-01-04 | 2 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Eager load event target authors whenever possibleconditionally-eager-load-event-target-authors | Yorick Peterse | 2018-01-04 | 2 | -0/+23 |
* | | | | | | | | | | | Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-m... | Douwe Maan | 2018-01-04 | 1 | -0/+25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclass | Sean McGivern | 2018-01-04 | 1 | -0/+25 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '3377-use-artifacts-tests-from-ee' into 'master' | Rémy Coutable | 2018-01-04 | 1 | -13/+34 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Just use the tests from EE3377-use-artifacts-tests-from-ee | Lin Jen-Shin | 2017-12-26 | 1 | -13/+34 |
* | | | | | | | | | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master' | Dmitriy Zaporozhets | 2018-01-04 | 2 | -58/+107 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository | Alejandro Rodríguez | 2018-01-03 | 2 | -28/+69 |
| * | | | | | | | | | | | Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository | Alejandro Rodríguez | 2018-01-03 | 2 | -30/+38 |
* | | | | | | | | | | | | Merge branch 'mk-no-op-delete-conflicting-redirects' into 'master' | Douwe Maan | 2018-01-04 | 2 | -28/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |