summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'db-copy-as-gfm-prosemirror' into 'master'Phil Hughes2019-01-2560-475/+1622
|\
| * Use nodes and marks to power Copy-as-GFMdb-copy-as-gfm-prosemirrorDouwe Maan2019-01-2419-473/+306
| * Add tiptap/prosemirror nodes and marks for all Markdown and GFM featuresDouwe Maan2019-01-2441-8/+1317
* | Merge branch '54250-upstream-kubeclient-redirect-patch' into 'master'Kamil Trzciński2019-01-256-26/+44
|\ \
| * | Use http_max_redirects opt to replace monkeypatchThong Kuah2019-01-256-26/+44
* | | Merge branch '40997-gitlab-pages-deploy-jobs-have-a-null-status' into 'master'Grzegorz Bizon2019-01-253-2/+23
|\ \ \
| * | | Treat "" as nil for external commit status descriptionVladimir Shushlin2019-01-222-2/+10
| * | | Fix empty labels for `pages:deploy` jobVladimir Shushlin2019-01-213-2/+15
* | | | Merge branch 'an-opentracing-active-record-tracing' into 'master'Kamil Trzciński2019-01-255-1/+130
|\ \ \ \
| * | | | Adds tracing support for ActiveRecord notificationsAndrew Newdigate2019-01-245-1/+130
* | | | | Merge branch '56424-fix-gl-form-init-tag-editing' into 'master'Filipa Lacerda2019-01-255-2/+97
|\ \ \ \ \
| * | | | | Init GLForm instance on form while editing tagsKushal Pandya2019-01-255-2/+97
|/ / / / /
* | | | | Merge branch 'diff-fix-folder-path-commas' into 'master'Filipa Lacerda2019-01-253-4/+57
|\ \ \ \ \
| * | | | | Fixed diff tree folders being rendered incorrectlyPhil Hughes2019-01-243-4/+57
* | | | | | Merge branch 'gt-externalize-app-views-projects-ci' into 'master'Filipa Lacerda2019-01-255-30/+110
|\ \ \ \ \ \
| * | | | | | Externalize strings from `/app/views/projects/ci`George Tsiolis2019-01-255-30/+110
|/ / / / / /
* | | | | | Merge branch 'diff-settings-dropdown' into 'master'Filipa Lacerda2019-01-2521-194/+411
|\ \ \ \ \ \
| * | | | | | Added dropdown for diff settingsPhil Hughes2019-01-2421-194/+411
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'qa-update-merge-request-page' into 'master'Ramya Authappan2019-01-252-16/+20
|\ \ \ \ \ \
| * | | | | | Update merge request page object and rebase testMark Lapierre2019-01-172-16/+20
* | | | | | | Merge branch 'mg-upgrade-webpack' into 'master'Phil Hughes2019-01-254-116/+87
|\ \ \ \ \ \ \
| * | | | | | | Upgrade webpack and monaco-editor to latestMike Greiling2019-01-254-116/+87
|/ / / / / / /
* | | | | | | Merge branch 'improve-personas-section-in-issue-template' into 'master'Mike Lewis2019-01-251-1/+24
|\ \ \ \ \ \ \
| * | | | | | | Minor edit to personas mentionMike Lewis2019-01-251-1/+1
| * | | | | | | Add more information about commentsbikebilly2019-01-241-1/+1
| * | | | | | | Reword intro on target audience, and remove some line breaks to compressMike Lewis2019-01-231-6/+3
| * | | | | | | Add slash commandsbikebilly2019-01-231-0/+10
| * | | | | | | Improve Target audience section for issue templatesbikebilly2019-01-211-1/+17
* | | | | | | | Merge branch '6769-epics-votes-ce' into 'master'Nick Thomas2019-01-251-0/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add missing attrs to Issue example API responsesMario de la Ossa2019-01-241-0/+18
* | | | | | | | Merge branch 'docs-api-page-fix' into 'master'Evan Read2019-01-251-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix typosCynthia Ng2019-01-241-2/+2
* | | | | | | | | Merge branch 'docs-autodevops-chart-per-env' into 'master'Evan Read2019-01-251-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Specify use of custom helm chart per envDaniel Gruesso2019-01-251-0/+5
|/ / / / / / / /
* | | | | | | | Merge branch '53950-commit-comments-displayed-on-a-merge-request' into 'master'56221-spec-features-projects-clusters-gcp_spec-rb-appears-to-be-making-real-google-api-requestsMike Greiling2019-01-247-10/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated i18n format for note header commit linkConstance Okoghenun2019-01-242-12/+5
| * | | | | | | | Updated i18n for discussion note commit SHAConstance Okoghenun2019-01-232-10/+19
| * | | | | | | | Added i18n to discussion note commit SHAConstance Okoghenun2019-01-222-2/+6
| * | | | | | | | Resolve commit comments displayed on a merge requestConstance Okoghenun2019-01-213-1/+9
| * | | | | | | | Refactored implementation of discussion note headerConstance Okoghenun2019-01-181-23/+10
| * | | | | | | | Added reloading to commit non-diff discussion note specConstance Okoghenun2019-01-181-0/+2
| * | | | | | | | Display "commented" only for commit discussions on merge requestsConstance Okoghenun2019-01-175-5/+52
* | | | | | | | | Merge branch 'docs/release-cadence-updates' into 'master'Mike Lewis2019-01-241-19/+17
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add clarity around meaning and potential range of version numbersMike Lewis2019-01-231-3/+5
| * | | | | | | | Added 'by default' re. annual major-release date schedulingMike Lewis2019-01-191-1/+1
| * | | | | | | | Update language on annual release dateMike Lewis2019-01-191-1/+1
| * | | | | | | | Edit table to be more explicit about when the releases areMike Lewis2019-01-181-5/+5
| * | | | | | | | Minor edits to wording and linksMike Lewis2019-01-181-4/+4
| * | | | | | | | Provide more information of release cadenceEvan Read2019-01-181-19/+15
* | | | | | | | | Merge branch 'remove-diff-coloring' into 'master'Fatih Acet2019-01-242-16/+17
|\ \ \ \ \ \ \ \ \