summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-apiChris Wilson2017-04-243-4/+21
* Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into 'mast...Yorick Peterse2017-04-244-11/+97
|\
| * Add changelog entry for !1046530306-transaction-while-moving-issues-to-ghost-userTimothy Andrew2017-04-241-0/+4
| * Move records to the ghost user in a transaction.Timothy Andrew2017-04-243-11/+93
* | Merge branch 'fix_link_in_readme' into 'master' Rémy Coutable2017-04-242-1/+5
|\ \
| * | Fix wrong link to GDK in README filedixpac2017-04-152-1/+5
* | | Merge branch 'mention-new-frontend-fixtures' into 'master' Rémy Coutable2017-04-241-2/+4
|\ \ \
| * | | Mention new mechanism to generate frontend fixturesWinnie Hellmann2017-04-141-2/+4
* | | | Merge branch '29801-add-slash-slack-commands-to-api-doc' into 'master' Sean McGivern2017-04-242-11/+73
|\ \ \ \
| * | | | [#29801] Add "Slack Slash Commands" to API docsTM Lee2017-04-242-11/+73
* | | | | Merge branch 'master' into 'master' Sean McGivern2017-04-241-1/+1
|\ \ \ \ \
| * | | | | Update plantuml.md Fix wrong order when restarting tomcat service [ci skip] Vladimir Tasic2017-04-211-1/+1
* | | | | | Merge branch '31072-activity-border' into 'master' Phil Hughes2017-04-242-2/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix border color on activities page31072-activity-borderAnnabel Dunstone Gray2017-04-212-2/+1
* | | | | | Merge branch 'submodules-no-dotgit' into 'master' Dmitriy Zaporozhets2017-04-223-9/+19
|\ \ \ \ \ \
| * | | | | | submodule_links: handle urls that don't end with .gitDavid Turner2017-04-213-9/+19
* | | | | | | Update VERSION to 9.2.0-prev9.2.0.preFelipe Artur2017-04-221-1/+1
* | | | | | | Update CHANGELOG.md for 9.1.0Felipe Artur2017-04-22234-941/+248
* | | | | | | Merge branch 'backup-restore-docs-update' into 'master' Marcia Ramos2017-04-221-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Reword backup & restore secrets descriptionbackup-restore-docs-updateCindy Pallares2017-04-201-4/+6
* | | | | | | | Merge branch 'dm-fix-project-import' into 'master' Robert Speicher2017-04-211-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable import URL field in New project form since it's hidden by defaultDouwe Maan2017-04-211-2/+3
* | | | | | | | | Merge branch '31265-update-auto-deploy-documentation-for-postgres-and-private...Achilleas Pipinellis2017-04-212-2/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Auto Deploy documentationJoshua Lambert2017-04-212-2/+32
|/ / / / / / / / /
* | | | | | | | | Merge branch 'remove-burndown-chart-reference-from-docs' into 'master' Felipe Artur2017-04-211-3/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove reference to burndown charts since they don't exist for ce.remove-burndown-chart-reference-from-docsVictor Wu2017-04-211-3/+0
* | | | | | | | | Merge branch '30618-change-placeholder-color' into 'master' Annabel Dunstone Gray2017-04-212-0/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix placeholder visibilityAndy2017-04-212-0/+30
* | | | | | | | | | Merge branch 'sentinel-psswd-docs' into 'master' Achilleas Pipinellis2017-04-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Use master_password for SentinelJose Torres2017-04-211-1/+1
* | | | | | | | | | Merge branch '30672-versioned-markdown-cache' into 'master' Douwe Maan2017-04-2112-251/+343
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Start versioning cached markdown fieldsNick Thomas2017-04-218-169/+329
| * | | | | | | | | Remove the ClearDatabaseCacheWorkerNick Thomas2017-04-215-70/+4
| * | | | | | | | | Fix Gitlab::Metrics metaprogramming magicNick Thomas2017-04-211-5/+5
| * | | | | | | | | Remove a use of module_functionNick Thomas2017-04-211-12/+10
* | | | | | | | | | 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