Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2018-01-05 | 16 | -1059/+9141 |
* | Merge branch '40622-use-left-right-and-max-count' into 'master' | Rémy Coutable | 2018-01-05 | 7 | -17/+141 |
|\ | |||||
| * | Use --left-right and --max-count for counting diverging commits | Lin Jen-Shin (godfat) | 2018-01-05 | 7 | -17/+141 |
|/ | |||||
* | Merge branch 'ce-backport=reorder-issues' into 'master' | Sean McGivern | 2018-01-05 | 12 | -61/+49 |
|\ | |||||
| * | Refactor matchers for background migrationsce-backport=reorder-issues | Jarka Kadlecová | 2018-01-05 | 11 | -55/+33 |
| * | Refactor RelativePositioning so that it can be used by other classes | Jarka Kadlecová | 2018-01-05 | 2 | -7/+17 |
* | | Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master' | Fatih Acet | 2018-01-05 | 1 | -4/+4 |
|\ \ | |||||
| * \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 41563-fix-branc... | Fatih Acet | 2018-01-05 | 60 | -349/+696 |
| |\ \ | |||||
| * | | | Fix custom name in branch creation for issue in Firefox41563-fix-branch-creation-from-issue-in-firefox | Eric Eastwood | 2018-01-04 | 1 | -4/+4 |
* | | | | Merge branch 'issues/40986/get-participants-from-issues-mr-api' into 'master' | Rémy Coutable | 2018-01-05 | 8 | -0/+149 |
|\ \ \ \ | |||||
| * | | | | API: get participants from merge_requests & issues | Brent Greeff | 2018-01-05 | 8 | -0/+149 |
* | | | | | Merge branch 'ac-autodevopfix-kubectl-version' into 'master' | Kamil Trzciński | 2018-01-05 | 2 | -4/+13 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-version | Alessio Caiazza | 2018-01-04 | 2 | -4/+13 |
* | | | | | Merge branch 'jprovazn-rebase' into 'master' | Filipa Lacerda | 2018-01-05 | 39 | -13/+820 |
|\ \ \ \ \ | |||||
| * | | | | | Backport 'Rebase' feature from EE to CEjprovazn-rebase | Jan Provaznik | 2018-01-05 | 40 | -13/+825 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'remove-project-repo' into 'master' | Sean McGivern | 2018-01-05 | 7 | -17/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Fix specsremove-project-repo | Jacob Vosmaer | 2018-01-05 | 5 | -11/+15 |
| * | | | | | Remove the Project#repo method | Jacob Vosmaer | 2018-01-04 | 2 | -6/+2 |
* | | | | | | Merge branch 'docs/qa/gb/document-integration-tests-in-merge-requests' into '... | Rémy Coutable | 2018-01-05 | 3 | -0/+91 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rephrase paragraph about e2e tests in merge requests in docs | Grzegorz Bizon | 2018-01-05 | 1 | -8/+6 |
| * | | | | | | Copy-edit end-to-end testing guide documentationdocs/qa/gb/document-integration-tests-in-merge-requests | Grzegorz Bizon | 2018-01-04 | 1 | -16/+18 |
| * | | | | | | Fix link to end-to-end testing docs from test pyramid | Grzegorz Bizon | 2018-01-02 | 1 | -1/+1 |
| * | | | | | | Copy-edit end-to-end testing guidelines | Grzegorz Bizon | 2018-01-02 | 1 | -13/+18 |
| * | | | | | | Link to end to end test guideline from test pyramid | Grzegorz Bizon | 2018-01-02 | 1 | -0/+3 |
| * | | | | | | Extend documentation on end-to-end integration tests | Grzegorz Bizon | 2018-01-02 | 2 | -9/+42 |
| * | | | | | | Add docs about end-to-end testing / GitLab QA tests | Grzegorz Bizon | 2018-01-02 | 2 | -0/+50 |
* | | | | | | | Merge branch 'api-domains-expose-project_id' into 'master' | Dmitriy Zaporozhets | 2018-01-05 | 5 | -1/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Expose project_id on /api/v4/pages/domains | Luc Didry | 2018-01-03 | 5 | -1/+10 |
* | | | | | | | | Merge branch 'ban-disk-import' into 'master' | Sean McGivern | 2018-01-05 | 3 | -1/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rubocopban-disk-import | Jacob Vosmaer | 2018-01-04 | 1 | -1/+1 |
| * | | | | | | | | Hide hooks stuff | Jacob Vosmaer | 2018-01-04 | 2 | -3/+2 |
| * | | | | | | | | get it working | Jacob Vosmaer | 2018-01-04 | 3 | -1/+11 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'backport-issue_3413' into 'master' | Sean McGivern | 2018-01-05 | 16 | -248/+516 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove EE only sections from docsbackport-issue_3413 | Felipe Artur | 2018-01-05 | 1 | -85/+0 |
| * | | | | | | | | EE-BACKPORT group boards | Felipe Artur | 2018-01-04 | 16 | -248/+601 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ce-4348-show-dast-results-in-the-mr-widget' into 'master' | Tim Zallmann | 2018-01-05 | 4 | -0/+97 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use computed prop in expand buttonce-4348-show-dast-results-in-the-mr-widget | Filipa Lacerda | 2018-01-05 | 1 | -1/+1 |
| * | | | | | | | | Backport of methods and components added in EBackport of methods and componen... | Filipa Lacerda | 2018-01-03 | 4 | -0/+97 |
* | | | | | | | | | Merge branch 'update-redis-rack' into 'master' | Rémy Coutable | 2018-01-05 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update redis-rack to 2.0.4update-redis-rack | Yorick Peterse | 2018-01-05 | 2 | -1/+6 |
* | | | | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2018-01-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Update settings.md | Gauthier Wallet | 2018-01-04 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'jivl-fix-import-project-url-bug' into 'master' | Tim Zallmann | 2018-01-05 | 3 | -17/+27 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix import project url not updating project namejivl-fix-import-project-url-bug | Jose Ivan Vargas | 2018-01-03 | 3 | -17/+27 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'winh-modal-target-id' into 'master' | Filipa Lacerda | 2018-01-05 | 15 | -115/+168 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add id to modal.vue to support data-toggle="modal" | Winnie Hellmann | 2018-01-05 | 15 | -115/+168 |
* | | | | | | | | | | Merge branch 'refactor-cluster-show-page-conservative' into 'master' | Filipa Lacerda | 2018-01-05 | 11 | -49/+50 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add back bottom margins for integration formrefactor-cluster-show-page-conservative | Matija Čupić | 2018-01-05 | 1 | -2/+2 |
| * | | | | | | | | | | Update Remove cluster subtitle and alert | Matija Čupić | 2018-01-04 | 1 | -2/+2 |
| * | | | | | | | | | | Update Advanced cluster settings subtitle | Matija Čupić | 2018-01-04 | 1 | -1/+1 |