summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Apply suggestion to spec/lib/gitlab/current_settings_spec.rb59462-applicatonsettings-not-tolerant-of-missing-db-columnsLin Jen-Shin2019-03-281-1/+1
* Use a Gitlab::FakeApplicationSettings when migrations are pendingRémy Coutable2019-03-262-3/+12
* Merge branch '49910-reopening-a-closed-milestone-from-the-closed-milestones-p...Rémy Coutable2019-03-263-1/+34
|\
| * Fix bug when reopening milestone from index pageMark Fletcher2019-03-263-1/+34
* | Merge branch 'revert-0be93623' into 'master'Phil Hughes2019-03-261-0/+6
|\ \
| * | Revert "Merge branch 'remove-unused-css-from-mr-24724' into 'master'"Paul Slaughter2019-03-261-0/+6
* | | Merge branch 'jc-add-docs-for-gitaly-feature-flags' into 'master'Achilleas Pipinellis2019-03-261-0/+79
|\ \ \
| * | | Add development documentation for gitaly feature flagsJohn Cai2019-03-261-0/+79
* | | | Merge branch 'doc-gitaly-ruby-workers' into 'master'Achilleas Pipinellis2019-03-261-0/+60
|\ \ \ \
| * | | | Add admin documentation for gitaly-rubyJacob Vosmaer2019-03-261-0/+60
|/ / / /
* | | | Merge branch 'osw-multi-assignees-merge-requests-migration' into 'master'Douglas Barbosa Alexandre2019-03-2610-1/+242
|\ \ \ \
| * | | | Add multiple assignees migration and table populationOswaldo Ferreira2019-03-2510-1/+242
* | | | | Merge branch 'sh-bump-rugged-0.28.1' into 'master'Robert Speicher2019-03-261-1/+1
|\ \ \ \ \
| * | | | | Bump Rugged to 0.28.1Stan Hu2019-03-261-1/+1
* | | | | | Merge branch 'backport-api-parameters' into 'master'Robert Speicher2019-03-269-48/+183
|\ \ \ \ \ \
| * | | | | | Backport parameters for API::ParametersYorick Peterse2019-03-261-0/+8
| * | | | | | Backport parameters for API::UsersYorick Peterse2019-03-261-0/+8
| * | | | | | Backport API parameters for API::SettingsYorick Peterse2019-03-261-0/+36
| * | | | | | Backport changes to API::ProtectedBranchesYorick Peterse2019-03-261-0/+24
| * | | | | | Backport parameters from API::ProjectsYorick Peterse2019-03-262-35/+44
| * | | | | | Backport API::Issues parameters from EEYorick Peterse2019-03-262-13/+37
| * | | | | | Backport API::Helpers::ProjectsHelpers from EEYorick Peterse2019-03-261-0/+11
| * | | | | | Backport EE API parameters for API::GroupsYorick Peterse2019-03-261-0/+15
* | | | | | | Merge branch 'docs/improve-emoji-display' into 'master'Achilleas Pipinellis2019-03-261-9/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix display of emoji in GFM docsEvan Read2019-03-261-9/+6
|/ / / / / / /
* | | | | | | Merge branch '49856-upgrade-bootstrap-form-gem' into 'master'Annabel Dunstone Gray2019-03-266-15/+21
|\ \ \ \ \ \ \
| * | | | | | | Add changelog entryEnrique Alcantara2019-03-251-0/+5
| * | | | | | | Fix regressions post bootstrap_form upgradeEnrique Alcantara2019-03-252-2/+11
| * | | | | | | Upgrade bootstrap_form gemEnrique Alcantara2019-03-253-13/+5
* | | | | | | | Merge branch 'zj-unify-ref-service-spec-ce-ee' into 'master'Yorick Peterse2019-03-261-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | GitalyClient spec: Remove the diff between CE/EEZeger-Jan van de Weg2019-03-261-0/+10
* | | | | | | | | Merge branch 'docs-redirects4' into 'master'Achilleas Pipinellis2019-03-2619-15/+87
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Docs: Add automatic redirects to last batch of moved filesMarcel Amirault2019-03-2619-15/+87
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/edit-wiki-notes' into 'master'Achilleas Pipinellis2019-03-261-5/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Edit wiki notesEvan Read2019-03-261-5/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dm-md-css' into 'master'Annabel Dunstone Gray2019-03-2656-419/+304
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add line type class to diff line num cellsDouwe Maan2019-03-262-8/+8
| * | | | | | | | | Restore Markdown table background color that was removed unnecessarilyDouwe Maan2019-03-261-0/+4
| * | | | | | | | | Remove now-unnecessary noteable_line classDouwe Maan2019-03-264-7/+7
| * | | | | | | | | Restructure and deduplicate table.code stylingDouwe Maan2019-03-262-141/+109
| * | | | | | | | | Stop diff table styling and Markdown table styling from conflictingDouwe Maan2019-03-263-12/+2
| * | | | | | | | | Add .code to all tables holding diffsDouwe Maan2019-03-269-60/+57
| * | | | | | | | | Remove now-unnecessary md-preview classDouwe Maan2019-03-265-8/+10
| * | | | | | | | | Add .md to immediate parent of Markdown contentDouwe Maan2019-03-266-7/+6
| * | | | | | | | | Move all Markdown styling to .md in typographyDouwe Maan2019-03-264-89/+51
| * | | | | | | | | Remove .wiki and @md-typography mixin in favor of .md and .md-fileDouwe Maan2019-03-2632-98/+61
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-hidden-statistics' into 'master'Nick Thomas2019-03-265-2/+18
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | correct view statistics ability documentationPeter Marko2019-03-261-1/+1
| * | | | | | | | Show statistics also when repository is disabledPeter Marko2019-03-234-1/+17
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'winh-remove-sushi' into 'master'Mike Greiling2019-03-26105-149/+147
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |