summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* New GitAccessResult::Success/CustomActionAsh McKenzie2018-09-062-0/+33
* Merge branch 'sh-add-ua-to-lograge-logs' into 'master'Sean McGivern2018-09-063-1/+8
|\
| * Add User-Agent to production_json.logStan Hu2018-09-053-1/+8
* | Merge branch 'bw-commonmark-for-files-docs' into 'master'Sean McGivern2018-09-061-8/+38
|\ \
| * | Update user markdown documentation for CommonMarkBrett Walker2018-09-061-8/+38
|/ /
* | Merge branch 'bw-commonmark-for-files' into 'master'Sean McGivern2018-09-0625-52/+285
|\ \
| * | remove guard clause and add comment on performaceBrett Walker2018-09-051-3/+7
| * | added feature flag 'commonmark_for_repositories'Brett Walker2018-09-054-2/+33
| * | add 'default_enabled' to feature flagsBrett Walker2018-09-054-8/+27
| * | move logic into legacy_render_context helper methodBrett Walker2018-09-059-16/+25
| * | render using RedCarpet if legacy_render parameter is setBrett Walker2018-09-0516-28/+181
| * | test that wiki links with spaces works in wiki pipelineBrett Walker2018-09-051-0/+14
| * | Enable CommonMark for files and wikisBrett Walker2018-09-054-10/+9
| * | url_helpers were not available on a code reloadBrett Walker2018-09-051-9/+13
* | | Merge branch 'rs-line-break-around-conditional-cop' into 'master'Sean McGivern2018-09-062-1/+22
|\ \ \
| * | | Fix LineBreakAroundConditionalBlock cop for a conditional after rescueRobert Speicher2018-09-052-1/+22
* | | | Merge branch '44704-improve-project-overview-ui' into 'master'Phil Hughes2018-09-0632-354/+705
|\ \ \ \
| * | | | Resolve "Improve project overview UI"Dennis Tang2018-09-0632-354/+705
|/ / / /
* | | | Merge branch 'monaco-upgrade' into 'master'Tim Zallmann2018-09-063-8/+13
|\ \ \ \
| * | | | Upgraded Monaco editor versionPhil Hughes2018-09-053-8/+13
* | | | | Merge branch 'ce-5306-more-custom-templates' into 'master'Robert Speicher2018-09-066-23/+139
|\ \ \ \ \
| * | | | | Backport changes to Gitlab::Tempalte::BaseTemplateNick Thomas2018-09-051-2/+6
| * | | | | Rename BlobsHelper#dropdown_namesNick Thomas2018-09-051-6/+6
| * | | | | Allow the TemplateFinder to handle licenses as wellNick Thomas2018-09-053-3/+28
| * | | | | Convert global templates to vendored templates via a ::TemplateFinderNick Thomas2018-09-054-19/+79
| * | | | | Allow repositories to be programmatically built in the specsNick Thomas2018-09-051-0/+27
* | | | | | Merge branch 'sh-bump-browser-gem' into 'master'Robert Speicher2018-09-053-5/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Bump browser gem to v2.5.3Stan Hu2018-09-053-5/+5
|/ / / / /
* | | | | Merge branch 'an/api-route-logger' into 'master'Stan Hu2018-09-053-0/+31
|\ \ \ \ \
| * | | | | Add route information to lograge structured loggingAndrew Newdigate2018-09-053-0/+31
* | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-09-051-0/+1
|\ \ \ \ \ \
| * | | | | | Document that when updating using a Helm chart 'helm repo update' needs to be...Reb2018-09-051-0/+1
* | | | | | | Merge branch 'feature/gb/allow-to-extend-keys-in-gitlab-ci-yml' into 'master'Kamil TrzciƄski2018-09-0512-10/+801
|\ \ \ \ \ \ \
| * | | | | | | Fix extended CI/CD configuration docs for `extends`Grzegorz Bizon2018-09-051-9/+5
| * | | | | | | Add docs for extended CI/CD config with `extends`Grzegorz Bizon2018-09-051-0/+78
| * | | | | | | Improve specs and error messages in extendable configGrzegorz Bizon2018-09-054-6/+33
| * | | | | | | Add unit test for `extends` in .gitlab-ci.ymlGrzegorz Bizon2018-09-051-1/+13
| * | | | | | | Add missing frozen_string_literal to some classesGrzegorz Bizon2018-09-052-0/+4
| * | | | | | | Improve extended CI/CD config error messagesGrzegorz Bizon2018-09-054-11/+13
| * | | | | | | Add changelog for extendable CI/CD configurationGrzegorz Bizon2018-09-051-0/+5
| * | | | | | | Simplify classes and exceptions of extendable configGrzegorz Bizon2018-09-056-46/+46
| * | | | | | | Limit extendable CI/CD config entry nesting levelsGrzegorz Bizon2018-09-053-9/+47
| * | | | | | | Add feature tests for CI/CD `extends` keywordGrzegorz Bizon2018-09-042-0/+76
| * | | | | | | Add support for `extends` key in CI/CD configurationGrzegorz Bizon2018-09-044-9/+54
| * | | | | | | Add test case describing circular dependency in `extends`Grzegorz Bizon2018-09-041-0/+11
| * | | | | | | Improve extended CI/CD config specs and fix a bugGrzegorz Bizon2018-09-044-11/+13
| * | | | | | | Use deep_dup to duplicate hash in CI/CD extendable configGrzegorz Bizon2018-09-041-1/+1
| * | | | | | | Add specs for extendable CI/CD hash entry classGrzegorz Bizon2018-09-043-19/+248
| * | | | | | | Improve extendable CI/CD config hash collectionGrzegorz Bizon2018-09-043-35/+45
| * | | | | | | Add test for simple ciricular dependency in `extends`Grzegorz Bizon2018-09-041-2/+20