summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix border color on activities page31072-activity-borderAnnabel Dunstone Gray2017-04-212-2/+1
* Merge branch 'dz-cleanup-add-users' into 'master' Douwe Maan2017-04-219-32/+53
|\
| * Refactor add_users method for project and groupdz-cleanup-add-usersDmitriy Zaporozhets2017-04-219-32/+53
* | Merge branch 'resolvable-discussions-docs' into 'master' Achilleas Pipinellis2017-04-2119-108/+154
|\ \
| * | Refactor Discussions docsAchilleas Pipinellis2017-04-2119-71/+83
| * | Fix broken linkLuke "Jared" Bennett2017-04-211-1/+1
| * | Added new discussions docsLuke "Jared" Bennett2017-04-213-2/+8
| * | Started on resolvable discussions docsLuke "Jared" Bennett2017-04-2115-31/+59
* | | Merge branch 'form-focus-previous-incorrect-form' into 'master' Filipa Lacerda2017-04-213-2/+54
|\ \ \
| * | | Improved the specform-focus-previous-incorrect-formPhil Hughes2017-04-211-9/+25
| * | | Fixed the preview keyboard shortcut focusing wrong tabPhil Hughes2017-04-213-2/+38
* | | | Merge branch 'sh-fix-issue-31215-2' into 'master' Douwe Maan2017-04-213-1/+30
|\ \ \ \
| * | | | Add a changelog entrysh-fix-issue-31215-2Lin Jen-Shin2017-04-211-0/+4
| * | | | Also test against external-issue for deleted projectsLin Jen-Shin2017-04-211-5/+17
| * | | | Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215Lin Jen-Shin2017-04-21276-1156/+4021
| |\ \ \ \
| * | | | | Fix Error 500 when referencing issue with project in pending deletesh-fix-issue-31215Stan Hu2017-04-202-1/+14
* | | | | | Merge branch 'environments-vue-3' into 'master' Phil Hughes2017-04-2110-310/+357
|\ \ \ \ \ \
| * | | | | | Refactor environments components into vue files - part 3Filipa Lacerda2017-04-2110-310/+357
|/ / / / / /
* | | | | | Merge branch 'fix-user-profile-tabs-showing-raw-json-instead' into 'master' Phil Hughes2017-04-213-15/+22
|\ \ \ \ \ \
| * | | | | | Append .json to ajax endpoint to prevent browser to display raw jsonAlfredo Sumaran2017-04-213-15/+22
* | | | | | | Merge branch '26208-animate-drodowns' into 'master' Clement Ho2017-04-2116-26/+124
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Adding animation for all dropdownNur Rony2017-04-2116-26/+124
|/ / / / / /
* | | | | | Merge branch 'vue-doc-2' into 'master' Phil Hughes2017-04-211-1/+17
|\ \ \ \ \ \
| * | | | | | Add help regarding vue resource and where to include itFilipa Lacerda2017-04-211-1/+17
|/ / / / / /
* | | | | | Merge branch '31193-ff-copy' into 'master' Douwe Maan2017-04-212-1/+8
|\ \ \ \ \ \
| * | | | | | fix inline diff copying in firefox31193-ff-copySimon Knox2017-04-212-1/+8
* | | | | | | Merge branch 'dz-refactor-admin-group-members' into 'master' Douwe Maan2017-04-213-2/+34
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-membersDmitriy Zaporozhets2017-04-203-2/+34
* | | | | | | Merge branch 'docs/mention-microsoft-teams' into 'master' Achilleas Pipinellis2017-04-212-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Mention Microsoft teams service in project services docdocs/mention-microsoft-teamsAchilleas Pipinellis2017-04-202-3/+4
* | | | | | | | Merge branch '2989-run-cicd-pipelines-on-a-schedule-experimental-doc' into 'm...Achilleas Pipinellis2017-04-215-1/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Add doc for scheduled triggerDosuken shinya2017-04-215-1/+29
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-user-activity-api' into 'master' Robert Speicher2017-04-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix user activities API version in docsfix-user-activity-apiSean McGivern2017-04-201-1/+1
* | | | | | | | | Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-213-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING e...fix/encoding-issueJames Lopez2017-04-203-1/+15
* | | | | | | | | | Merge branch '31189-pipelines-error-state' into 'master' Phil Hughes2017-04-213-7/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Guarantee only one state is shown at a time31189-pipelines-error-stateFilipa Lacerda2017-04-203-7/+25
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-213-2/+44
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing newlineswinniehell2017-04-201-0/+6
| * | | | | | | | | | Add missing newlineswinniehell2017-04-201-0/+16
| * | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 (!10786)winniehell2017-04-202-2/+9
| * | | | | | | | | | Add failing test for #31012winniehell2017-04-191-0/+13
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Update CHANGELOG.md for 9.0.6James Lopez2017-04-2110-37/+12
* | | | | | | | | | Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' into...Filipa Lacerda2017-04-218-29/+129
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Add Fork/Cancel confirmation to "Replace"/"Delete" buttons30637-replace-delete-buttons-get-fork-cancel-confirmationEric Eastwood2017-04-208-29/+129
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'vue-pipelines-folder' into 'master' Phil Hughes2017-04-2111-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change spec folder to match the assets onevue-pipelines-folderFilipa Lacerda2017-04-2011-0/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-update-ci-templates' into 'master' Kamil TrzciƄski2017-04-203-8/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update CI templates to include 9.1 templatesZeger-Jan van de Weg2017-04-203-8/+86
|/ / / / / / / / /