summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't fail on an empty databasezj-drop-gitorious-fieldZ.J. van de Weg2016-09-052-6/+11
* Support MySQL too, when removing gitorious from import_sourcesZ.J. van de Weg2016-09-051-1/+5
* Remove gitorious from import_sources on ApplicationSetting modelZ.J. van de Weg2016-09-053-1/+33
* Merge branch 'fix-changelog' into 'master' Rémy Coutable2016-09-051-3/+3
|\
| * Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12fix-changelogWinnie2016-09-021-3/+3
* | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-0536-186/+424
|\ \
| * \ Merge branch 'fix-confidential-issues-webhooks' into 'master' Douwe Maan2016-09-0120-90/+238
| |\ \
| | * | Add migration to set confidential issues events on web hooksDouglas Barbosa Alexandre2016-09-012-1/+16
| | * | Update CHANGELOGDouglas Barbosa Alexandre2016-08-311-0/+1
| | * | Scope hooks thal will run for confidential issuesDouglas Barbosa Alexandre2016-08-317-22/+55
| | * | Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-317-18/+37
| | * | Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-316-12/+37
| | * | Update service specs to avoid instance variablesDouglas Barbosa Alexandre2016-08-313-40/+40
| | * | Fix confidential issues should not be passed to WebhooksDouglas Barbosa Alexandre2016-08-315-22/+77
| |/ /
| * | Merge branch '21457-not-create-groups-for-unallowed-users-when-importing-proj...Robert Speicher2016-08-3117-99/+184
| |\ \
| | * | Update CHANGELOGDouglas Barbosa Alexandre2016-08-311-3/+1
| | * | Refactoring Import::BaseController#find_or_create_namespaceDouglas Barbosa Alexandre2016-08-318-47/+53
| | * | Don't create groups for unallowed users when importing projectsDouglas Barbosa Alexandre2016-08-3112-56/+137
| |/ /
* | | Merge branch 'fix-missing-flash-messages' into 'master' Rémy Coutable2016-09-053-3/+19
|\ \ \
| * | | Fix missing flash messages on service edit pageAirat Shigapov2016-09-053-3/+19
* | | | Merge branch 'safe-ref-updates' into 'master' Douwe Maan2016-09-055-29/+56
|\ \ \ \
| * | | | Make error message appropriate for end usersJacob Vosmaer2016-09-021-2/+2
| * | | | Use 'git update-ref' for safer web commitsJacob Vosmaer2016-09-025-29/+56
* | | | | Merge branch 'docs-gitlab-ci-dropdown' into 'master' Achilleas Pipinellis2016-09-0519-156/+177
|\ \ \ \ \
| * | | | | Move docs for template dropdowns to the new locationdocs-gitlab-ci-dropdownAchilleas Pipinellis2016-09-026-14/+24
| * | | | | Move web_editor doc to new locationAchilleas Pipinellis2016-09-0215-152/+153
| * | | | | Correct spelling of therefore [ci skip]Z.J. van de Weg2016-09-021-1/+1
| * | | | | Add documentation on template dropdownsZ.J. van de Weg2016-09-024-3/+13
* | | | | | Merge branch 'patch-5' into 'master' Achilleas Pipinellis2016-09-051-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update README.mdGustav Trenwith2016-09-051-1/+1
| * | | | | Update README.mdGustav Trenwith2016-09-021-1/+2
| |/ / / /
* | | | | Merge branch 'zj-add-link-docs-index' into 'master' Achilleas Pipinellis2016-09-041-1/+2
|\ \ \ \ \
| * | | | | Add link on API docs index pagezj-add-link-docs-indexZ.J. van de Weg2016-09-031-1/+2
* | | | | | Merge branch 'fix-spec-failures-diff-spec' into 'master' Stan Hu2016-09-041-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix randomly failing specs in expand_collapse_diff_spec:Stan Hu2016-09-031-0/+7
|/ / / / /
* | | | | Merge branch 'fix-suggested-colors-underline' into 'master' Annabel Dunstone Gray2016-09-022-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove suggested colors hover underlineClement Ho2016-09-022-0/+2
* | | | | Merge branch 'icon-button-alignment' into 'master' Fatih Acet2016-09-024-5/+8
|\ \ \ \ \
| * | | | | Fix alignment of icon buttons (!5887)winniehell2016-08-194-5/+8
* | | | | | Merge branch 'fix-wiki-anchor-interaction' into 'master' Fatih Acet2016-09-024-17/+12
|\ \ \ \ \ \
| * | | | | | Fix markdown anchor icon interactionClement Ho2016-09-024-17/+12
* | | | | | | Merge branch '21471-bold-text-in-ci-build-output-not-styled' into 'master' Annabel Dunstone Gray2016-09-021-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Added `.term-bold` declaration.21471-bold-text-in-ci-build-output-not-styledLuke "Jared" Bennett2016-09-021-0/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix-add-button-alignment' into 'master' Fatih Acet2016-09-022-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Align add button on repository viewClement Ho2016-09-012-0/+5
* | | | | | | | Merge branch 'replace-coffeescript' into 'master' Fatih Acet2016-09-023-50/+65
|\ \ \ \ \ \ \ \
| * | | | | | | | Convert datetime coffeescript spec to ES6Clement Ho2016-09-013-50/+65
| |/ / / / / / /
* | | | | | | | Merge branch 'project-edit-features-hide' into 'master' Fatih Acet2016-09-024-18/+86
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactored code to rely less on IDs that could changeproject-edit-features-hidePhil Hughes2016-09-022-6/+14
| * | | | | | | | Hides merge request section in edit project when disabledPhil Hughes2016-09-023-15/+75
| | |/ / / / / / | |/| | | | | |