Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'db-copy-as-gfm-prosemirror' into 'master' | Phil Hughes | 2019-01-25 | 60 | -475/+1622 |
|\ | |||||
| * | Use nodes and marks to power Copy-as-GFMdb-copy-as-gfm-prosemirror | Douwe Maan | 2019-01-24 | 19 | -473/+306 |
| * | Add tiptap/prosemirror nodes and marks for all Markdown and GFM features | Douwe Maan | 2019-01-24 | 41 | -8/+1317 |
* | | Merge branch '54250-upstream-kubeclient-redirect-patch' into 'master' | Kamil Trzciński | 2019-01-25 | 6 | -26/+44 |
|\ \ | |||||
| * | | Use http_max_redirects opt to replace monkeypatch | Thong Kuah | 2019-01-25 | 6 | -26/+44 |
* | | | Merge branch '40997-gitlab-pages-deploy-jobs-have-a-null-status' into 'master' | Grzegorz Bizon | 2019-01-25 | 3 | -2/+23 |
|\ \ \ | |||||
| * | | | Treat "" as nil for external commit status description | Vladimir Shushlin | 2019-01-22 | 2 | -2/+10 |
| * | | | Fix empty labels for `pages:deploy` job | Vladimir Shushlin | 2019-01-21 | 3 | -2/+15 |
* | | | | Merge branch 'an-opentracing-active-record-tracing' into 'master' | Kamil Trzciński | 2019-01-25 | 5 | -1/+130 |
|\ \ \ \ | |||||
| * | | | | Adds tracing support for ActiveRecord notifications | Andrew Newdigate | 2019-01-24 | 5 | -1/+130 |
* | | | | | Merge branch '56424-fix-gl-form-init-tag-editing' into 'master' | Filipa Lacerda | 2019-01-25 | 5 | -2/+97 |
|\ \ \ \ \ | |||||
| * | | | | | Init GLForm instance on form while editing tags | Kushal Pandya | 2019-01-25 | 5 | -2/+97 |
|/ / / / / | |||||
* | | | | | Merge branch 'diff-fix-folder-path-commas' into 'master' | Filipa Lacerda | 2019-01-25 | 3 | -4/+57 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed diff tree folders being rendered incorrectly | Phil Hughes | 2019-01-24 | 3 | -4/+57 |
* | | | | | | Merge branch 'gt-externalize-app-views-projects-ci' into 'master' | Filipa Lacerda | 2019-01-25 | 5 | -30/+110 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Externalize strings from `/app/views/projects/ci` | George Tsiolis | 2019-01-25 | 5 | -30/+110 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'diff-settings-dropdown' into 'master' | Filipa Lacerda | 2019-01-25 | 21 | -194/+411 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added dropdown for diff settings | Phil Hughes | 2019-01-24 | 21 | -194/+411 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'qa-update-merge-request-page' into 'master' | Ramya Authappan | 2019-01-25 | 2 | -16/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update merge request page object and rebase test | Mark Lapierre | 2019-01-17 | 2 | -16/+20 |
* | | | | | | | Merge branch 'mg-upgrade-webpack' into 'master' | Phil Hughes | 2019-01-25 | 4 | -116/+87 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Upgrade webpack and monaco-editor to latest | Mike Greiling | 2019-01-25 | 4 | -116/+87 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'improve-personas-section-in-issue-template' into 'master' | Mike Lewis | 2019-01-25 | 1 | -1/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Minor edit to personas mention | Mike Lewis | 2019-01-25 | 1 | -1/+1 |
| * | | | | | | | Add more information about comments | bikebilly | 2019-01-24 | 1 | -1/+1 |
| * | | | | | | | Reword intro on target audience, and remove some line breaks to compress | Mike Lewis | 2019-01-23 | 1 | -6/+3 |
| * | | | | | | | Add slash commands | bikebilly | 2019-01-23 | 1 | -0/+10 |
| * | | | | | | | Improve Target audience section for issue templates | bikebilly | 2019-01-21 | 1 | -1/+17 |
* | | | | | | | | Merge branch '6769-epics-votes-ce' into 'master' | Nick Thomas | 2019-01-25 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Add missing attrs to Issue example API responses | Mario de la Ossa | 2019-01-24 | 1 | -0/+18 |
* | | | | | | | | Merge branch 'docs-api-page-fix' into 'master' | Evan Read | 2019-01-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix typos | Cynthia Ng | 2019-01-24 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'docs-autodevops-chart-per-env' into 'master' | Evan Read | 2019-01-25 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Specify use of custom helm chart per env | Daniel Gruesso | 2019-01-25 | 1 | -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-requests | Mike Greiling | 2019-01-24 | 7 | -10/+60 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Updated i18n format for note header commit link | Constance Okoghenun | 2019-01-24 | 2 | -12/+5 |
| * | | | | | | | | Updated i18n for discussion note commit SHA | Constance Okoghenun | 2019-01-23 | 2 | -10/+19 |
| * | | | | | | | | Added i18n to discussion note commit SHA | Constance Okoghenun | 2019-01-22 | 2 | -2/+6 |
| * | | | | | | | | Resolve commit comments displayed on a merge request | Constance Okoghenun | 2019-01-21 | 3 | -1/+9 |
| * | | | | | | | | Refactored implementation of discussion note header | Constance Okoghenun | 2019-01-18 | 1 | -23/+10 |
| * | | | | | | | | Added reloading to commit non-diff discussion note spec | Constance Okoghenun | 2019-01-18 | 1 | -0/+2 |
| * | | | | | | | | Display "commented" only for commit discussions on merge requests | Constance Okoghenun | 2019-01-17 | 5 | -5/+52 |
* | | | | | | | | | Merge branch 'docs/release-cadence-updates' into 'master' | Mike Lewis | 2019-01-24 | 1 | -19/+17 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add clarity around meaning and potential range of version numbers | Mike Lewis | 2019-01-23 | 1 | -3/+5 |
| * | | | | | | | | Added 'by default' re. annual major-release date scheduling | Mike Lewis | 2019-01-19 | 1 | -1/+1 |
| * | | | | | | | | Update language on annual release date | Mike Lewis | 2019-01-19 | 1 | -1/+1 |
| * | | | | | | | | Edit table to be more explicit about when the releases are | Mike Lewis | 2019-01-18 | 1 | -5/+5 |
| * | | | | | | | | Minor edits to wording and links | Mike Lewis | 2019-01-18 | 1 | -4/+4 |
| * | | | | | | | | Provide more information of release cadence | Evan Read | 2019-01-18 | 1 | -19/+15 |
* | | | | | | | | | Merge branch 'remove-diff-coloring' into 'master' | Fatih Acet | 2019-01-24 | 2 | -16/+17 |
|\ \ \ \ \ \ \ \ \ |