summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge branch 'docs-import-links' into 'master'Achilleas Pipinellis2019-01-251-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linking to backup doc from migration doc, for self-hosted to self-hosted migration Closes #56339 See merge request gitlab-org/gitlab-ce!24592
| * | | | | | | | | | | | | | | | | Linking to backup doc from migration doc, for self-hosted to self-hosted ↵Marcel Amirault2019-01-251-0/+7
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration
* | | | | | | | | | | | | | | | | Merge branch 'db-copy-as-gfm-prosemirror' into 'master'Phil Hughes2019-01-2560-475/+1622
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reimplement Copy-as-GFM using the prosemirror document model See merge request gitlab-org/gitlab-ce!22797
| * | | | | | | | | | | | | | | | | Use nodes and marks to power Copy-as-GFMdb-copy-as-gfm-prosemirrorDouwe Maan2019-01-2419-473/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec needed to be updated because in some cases the resulting Markdown is slightly different, though equally valid.
| * | | | | | | | | | | | | | | | | Add tiptap/prosemirror nodes and marks for all Markdown and GFM featuresDouwe Maan2019-01-2441-8/+1317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The schema is built on top of the default schema and Node and Mark classes provided by tiptap-extensions. prosemirror-model is used to parse HTML/DOM into a prosemirror document, and prosemirror-markdown is used to serialize this document to (GitLab Flavored) Markdown.
* | | | | | | | | | | | | | | | | | Merge branch '54250-upstream-kubeclient-redirect-patch' into 'master'Kamil Trzciński2019-01-256-26/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use http_max_redirects opt to replace monkeypatch Closes #54250 See merge request gitlab-org/gitlab-ce!24284
| * | | | | | | | | | | | | | | | | | Use http_max_redirects opt to replace monkeypatchThong Kuah2019-01-256-26/+44
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http_max_redirects was introduced in 4.2.2, so upgrade kubeclient. The monkey-patch was global so we will have to check that all instances of Kubeclient::Client are handled. Spec all methods of KubeClient This should provide better confidence that we are indeed disallowing redirection in all cases
* | | | | | | | | | | | | | | | | | Merge branch '40997-gitlab-pages-deploy-jobs-have-a-null-status' into 'master'Grzegorz Bizon2019-01-253-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix empty labels for `pages:deploy` job Closes #40997 See merge request gitlab-org/gitlab-ce!24451
| * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use description of GenericCommitStatus as label if provided Fallback to core status labels if not
* | | | | | | | | | | | | | | | | | | Merge branch 'an-opentracing-active-record-tracing' into 'master'Kamil Trzciński2019-01-255-1/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tracing support for ActiveRecord notifications See merge request gitlab-org/gitlab-ce!24604
| * | | | | | | | | | | | | | | | | | | Adds tracing support for ActiveRecord notificationsAndrew Newdigate2019-01-245-1/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will publish distributed tracing spans related to SQL ActiveRecord queries. These queries are unbound, so will still contain parameter substitution strings in place of actual parameter values. This ensures that the SQL strings do not need to be scrubbed, since the values are not included in the SQL. More details of rails instrumentation can be found here: https://guides.rubyonrails.org/active_support_instrumentation.html
* | | | | | | | | | | | | | | | | | | | Merge branch '56424-fix-gl-form-init-tag-editing' into 'master'Filipa Lacerda2019-01-255-2/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init GLForm instance on form while editing tags Closes #56424 See merge request gitlab-org/gitlab-ce!24645
| * | | | | | | | | | | | | | | | | | | | 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 incorrectly See merge request gitlab-org/gitlab-ce!24635
| * | | | | | | | | | | | | | | | | | | | 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` See merge request gitlab-org/gitlab-ce!24617
| * | | | | | | | | | | | | | | | | | | 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 settings Closes #55491 See merge request gitlab-org/gitlab-ce!24460
| * | | | | | | | | | | | | | | | | | | Added dropdown for diff settingsPhil Hughes2019-01-2421-194/+411
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdown includes buttons for tree view rendering mode and buttons for the compare view (inline or side-by-side) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
* | | | | | | | | | | | | | | | | | | Merge branch 'qa-update-merge-request-page' into 'master'Ramya Authappan2019-01-252-16/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge request page object and rebase test Closes gitlab-org/quality/staging#3 See merge request gitlab-org/gitlab-ce!24375
| * | | | | | | | | | | | | | | | | | | Update merge request page object and rebase testMark Lapierre2019-01-172-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use logged methods from Page::Base. Raise errors if rebase! and merge! don't leave the UI in the expected state.
* | | | | | | | | | | | | | | | | | | | Merge branch 'mg-upgrade-webpack' into 'master'Phil Hughes2019-01-254-116/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade webpack and monaco-editor to latest See merge request gitlab-org/gitlab-ce!24646
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Target audience section for issue templates See merge request gitlab-org/gitlab-ce!24527
| * | | | | | | | | | | | | | | | | | | 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 responses See merge request gitlab-org/gitlab-ce!24641
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fix typos on API page See merge request gitlab-org/gitlab-ce!24657
| * | | | | | | | | | | | | | | | | | | | 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 env See merge request gitlab-org/gitlab-ce!24541
| * | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Commit comments displayed on a merge request that contains that commit no longer specify which commit they come from" Closes #53950 See merge request gitlab-org/gitlab-ce!24427
| * | | | | | | | | | | | | | | | | | | | Updated i18n format for note header commit linkConstance Okoghenun2019-01-242-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unified commit link in note header action text
| * | | | | | | | | | | | | | | | | | | | Updated i18n for discussion note commit SHAConstance Okoghenun2019-01-232-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensured that sentence order is preserved when translating
| * | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing i18n strings - Added changelog entry - Fixed lint errors
| * | | | | | | | | | | | | | | | | | | | Refactored implementation of discussion note headerConstance Okoghenun2019-01-181-23/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed use of v-html - Removed HTML content from the computed property
| * | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add commit prop to NoteableNote component and pass it from NoteableDiscussion
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/release-cadence-updates' into 'master'Mike Lewis2019-01-241-19/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide more information of release cadence See merge request gitlab-org/gitlab-ce!24479
| * | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | |