summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unused `gitlab:generate_docs` Rake taskrs-remove-sdocRobert Speicher2016-11-034-22/+0
* Merge branch 'no-include-on-top-level' into 'master' Rémy Coutable2016-11-031-2/+5
|\
| * Use stubs instead of modifying global statesno-include-on-top-levelLin Jen-Shin2016-11-031-1/+3
| * Try not to include anything globally!Lin Jen-Shin2016-11-031-1/+2
* | Merge branch 'zj-expose-system-hooks' into 'master' Rémy Coutable2016-11-034-16/+44
|\ \
| * | Update docs and test descriptionzj-expose-system-hooksZ.J. van de Weg2016-11-022-5/+6
| * | Update docs and unexpose tokenZeger-Jan van de Weg2016-11-024-12/+22
| * | Be able to POST subscriptions for system hooksZ.J. van de Weg2016-10-312-2/+20
| * | Expose more data on the SystemHooks APIZ.J. van de Weg2016-10-311-4/+3
* | | Merge branch 'update-install-guide-8-14' into 'master' Rémy Coutable2016-11-032-2/+207
|\ \ \
| * | | Update "Installation from source" guide for 8.14.0Alejandro Rodríguez2016-11-032-2/+207
* | | | Add CHANGELOG entries for latest patchesRémy Coutable2016-11-031-4/+16
* | | | Merge branch 'fix/import-export-symlink-vulnerability' into 'security'Douwe Maan2016-11-037-4/+105
* | | | Merge branch 'fix/import-projectmember-security' into 'security'Douwe Maan2016-11-034-14/+34
* | | | Add changelog instructions to CHANGELOG.mdRobert Speicher2016-11-031-1/+4
|/ / /
* | | Update help banner for bin/changelogRobert Speicher2016-11-031-1/+1
| |/ |/|
* | Merge branch 'rs-changelog-force' into 'master' Rémy Coutable2016-11-033-2/+38
|\ \
| * | Add a `--force` option to bin/changelogrs-changelog-forceRobert Speicher2016-11-023-2/+38
* | | Merge branch 'eslint-check-file-names' into 'master' Fatih Acet2016-11-023-0/+8
|\ \ \ | |/ / |/| |
| * | Check that JavaScript file names match convention (!7238)winniehell2016-11-023-0/+8
* | | Merge branch 'sortable-version-update' into 'master' Fatih Acet2016-11-023-55/+149
|\ \ \
| * | | Updated Sortable JS pluginsortable-version-updatePhil Hughes2016-11-013-55/+149
* | | | Merge branch 'post_receive-spaces' into 'master' Rémy Coutable2016-11-021-3/+3
|\ \ \ \
| * | | | remove extra spaces from app/workers/post_receive.rbElan Ruusamäe2016-11-011-3/+3
* | | | | Merge branch 'rs-changelog-docs' into 'master' vue-ize-field-errorsRobert Speicher2016-11-021-3/+3
|\ \ \ \ \
| * | | | | Update examples in changelog docs to use single quotes around titleRobert Speicher2016-11-021-3/+3
|/ / / / /
* | | | | Merge branch 'boards-filter-zindex' into 'master' Annabel Dunstone Gray2016-11-021-5/+0
|\ \ \ \ \
| * | | | | Removed z-index for filters on issue boardsboards-filter-zindexPhil Hughes2016-11-021-5/+0
* | | | | | Merge branch 'edit-button-wiki' into 'master' Annabel Dunstone Gray2016-11-024-7/+8
|\ \ \ \ \ \
| * | | | | | Add a CHANGELOG entryHiroyuki Sato2016-11-011-0/+1
| * | | | | | Fix edit button wikiHiroyuki Sato2016-11-013-7/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs-bin-changelog' into 'master' Rémy Coutable2016-11-025-7/+396
|\ \ \ \ \ \
| * | | | | | Add specs for ChangelogOptionParser in bin/changelogrs-bin-changelogRobert Speicher2016-10-312-1/+67
| * | | | | | Add changelog documentationRobert Speicher2016-10-313-7/+167
| * | | | | | Add a bin/changelog scriptRobert Speicher2016-10-311-0/+163
* | | | | | | Merge branch 'eslint-ignore-coverage-files' into 'master' Rémy Coutable2016-11-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Make ESLint ignore instrumented files for coverage analysis (!7236)winniehell2016-11-021-0/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'update-diffy' into 'master' Rémy Coutable2016-11-022-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update diffy gem to 3.1.0Manuel Rüger2016-10-312-3/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'bkintz/gitlab-ce-17846-jira-comment-path'Rémy Coutable2016-11-023-1/+24
|\ \ \ \ \ \ \
| * | | | | | | Use the server's base URL without relative URL part when creating links in JIRABrian Kintz2016-11-023-1/+24
|/ / / / / / /
* | | | | | | Merge branch 'fix/contributing-mr-template' into 'master' Rémy Coutable2016-11-021-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Replace MR Description Format links Daniel Axelrod2016-11-021-3/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'patch-8' into 'master' Rémy Coutable2016-11-021-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Update gitlab.yml.exampleElan Ruusamäe2016-11-021-1/+3
| |/ / / / / /
* | | | | | | Merge branch 'update-rack-attack' into 'master' Rémy Coutable2016-11-022-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update rack-attack gem to 4.4.1Manuel Rüger2016-10-312-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mrchrisw/gitlab-version-fix' into 'master' Achilleas Pipinellis2016-11-021-2/+2
|\ \ \ \ \ \ \
| * | | | | | | GitLab 8.13 not 13mrchrisw/gitlab-version-fixChris Wilson2016-11-021-2/+2
* | | | | | | | Merge branch 'fix/backtrace-command' into 'master' Sean McGivern2016-11-021-1/+1
|\ \ \ \ \ \ \ \