summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 11.7.0-prev11.7.0.prewinh-revert-discussion-header-commentedGitLab Release Tools Bot2018-12-211-1/+1
* Update CHANGELOG.md for 11.6.0GitLab Release Tools Bot2018-12-21253-1272/+277
* Merge branch 'gt-rename-cluster-platform-configure-worker' into 'master'Douglas Barbosa Alexandre2018-12-2115-18/+101
|\
| * Rename `ClusterPlatformConfigureWorker`George Tsiolis2018-12-2115-18/+101
|/
* Merge branch 'markdown-toolbar-btn-fix' into 'master'Filipa Lacerda2018-12-213-3/+12
|\
| * Fixes the markdown toolbar buttonsPhil Hughes2018-12-213-3/+12
* | Merge branch 'feature/option-to-make-variables-protected' into 'master'Grzegorz Bizon2018-12-2117-26/+138
|\ \
| * \ Merge branch 'master' into 'feature/option-to-make-variables-protected'Grzegorz Bizon2018-12-202082-14703/+42264
| |\ \
| * | | callout when ci variables are protected by defaultAlexis Reigel2018-12-043-4/+20
| * | | extract protected variable logic to helperAlexis Reigel2018-12-042-2/+17
| * | | extract common env. variable template to partialAlexis Reigel2018-12-044-17/+13
| * | | change copy to "Environment variables"Alexis Reigel2018-11-293-5/+8
| * | | add changelogAlexis Reigel2018-11-291-0/+5
| * | | option to make variables protected by defaultAlexis Reigel2018-11-2910-5/+82
* | | | Merge branch '55639-releases' into 'master'Phil Hughes2018-12-214-18/+25
|\ \ \ \
| * | | | Resolve "Wrong API call on releases page"Filipa Lacerda2018-12-214-18/+25
|/ / / /
* | | | Merge branch '55293-split-bio-into-individual-line-in-extended-user-tooltips'...Filipa Lacerda2018-12-214-27/+16
|\ \ \ \
| * | | | Split bio into individual line in extended user tooltipsMartin Wortschack2018-12-214-27/+16
* | | | | Merge branch '53933-include-dates-in-milestone-change-email' into 'master'Lin Jen-Shin2018-12-2110-7/+50
|\ \ \ \ \
| * | | | | Add changelog entryHeinrich Lee Yu2018-12-211-0/+5
| * | | | | Add date range to milestone changed emailsHeinrich Lee Yu2018-12-219-7/+45
* | | | | | Merge branch 'docs/k8s-apps-navigation' into 'master'Achilleas Pipinellis2018-12-211-10/+19
|\ \ \ \ \ \
| * | | | | | Clarify where the k8s applications can be foundAchilleas Pipinellis2018-12-191-10/+19
* | | | | | | Merge branch 'ce-7427-track-navbar-clicks-on-gitlab-com' into 'master'Phil Hughes2018-12-214-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Support navbar trackingMartin Wortschack2018-12-214-5/+5
* | | | | | | | Merge branch 'specs-positional-arguments' into 'master'Lin Jen-Shin2018-12-2137-158/+165
|\ \ \ \ \ \ \ \
| * | | | | | | | convert specs in javascripts/ and support/ to new syntaxJasper Maes2018-12-2137-158/+165
* | | | | | | | | Merge branch 'update-nokogiri' into 'master'Lin Jen-Shin2018-12-212-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update minimum version of nokogiriPirate Praveen2018-12-212-2/+2
* | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2018-12-217-4/+76
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'security-import-symlink' into 'master'John Jarvis2018-12-216-4/+62
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix persistent symlink in project importJames Lopez2018-12-176-4/+62
| * | | | | | | | | | Update CHANGELOG.md for 11.3.14GitLab Release Tools Bot2018-12-201-0/+7
| * | | | | | | | | | Update CHANGELOG.md for 11.5.5GitLab Release Tools Bot2018-12-201-0/+7
* | | | | | | | | | | Merge branch 'dm-note-email-image-diff-discussion' into 'master'Sean McGivern2018-12-218-36/+36
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add changelog entryDouwe Maan2018-12-201-0/+5
| * | | | | | | | | | | Always use colon at end of discussion notification email headlineDouwe Maan2018-12-202-17/+5
| * | | | | | | | | | | Don't include diff lines in image diff note notification emailDouwe Maan2018-12-201-1/+1
| * | | | | | | | | | | Allow truncated_diff_lines to be called on image diff discussionDouwe Maan2018-12-202-2/+9
| * | | | | | | | | | | Add image_diff_note_on_merge_request factoryDouwe Maan2018-12-202-16/+16
* | | | | | | | | | | | Merge branch '55611-always-load-metrics-the-last' into 'master'Sean McGivern2018-12-213-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Always load the metrics the lastLin Jen-Shin2018-12-213-2/+5
* | | | | | | | | | | | | Merge branch 'winh-merge-request-commit-context' into 'master'Kushal Pandya2018-12-214-27/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MR commits display commit ID for discussionsFatih Acet2018-12-214-27/+93
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '55621-gitlab-ci-yml-on-serverless-docs' into 'master'Evan Read2018-12-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix typos about .gitlab-ci.yml in Serverless docs.Takuya Noguchi2018-12-211-2/+2
* | | | | | | | | | | | | Merge branch 'winh-discussion-header-commented' into 'master'Mike Greiling2018-12-207-10/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Link to specific commit note from MR commit discussion linkDouwe Maan2018-12-192-3/+3
| * | | | | | | | | | | | | Display "commented" only for commit discussions on merge requestsWinnie Hellmann2018-12-194-7/+47
| * | | | | | | | | | | | | Add failing test for commit ID in discussion headerWinnie Hellmann2018-12-191-0/+8