summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Links the issue which introduced the featureac-pages-subgroupsMarcia Ramos2019-01-141-2/+1
|
* Enable Gitlab-Pages for subgroupsAlessio Caiazza2019-01-148-12/+25
| | | | | | | | | | | | | GitLab Pages supports projects hosted under a subgroup, but not subgroup websites. That means that only the highest-level group supports i.e.: You created a group for your engineering department called `engineering`, a subgroup for all your documentation websites called `docs`,and a project within this subgroup is called `workflows`. Your project URL is `https://gitlab.com/engineering/docs/workflows/`. Once you enable GitLab Pages for this project, the site will live under `https://engineering.gitlab.io/docs/workflows`.
* Merge branch 'docs-update-clusters-link-title' into 'master'Evan Read2019-01-141-1/+1
|\ | | | | | | | | Docs: Update link title, we support more than GKE See merge request gitlab-org/gitlab-ce!24347
| * Update link title, we support more than GKEThong Kuah2019-01-111-1/+1
| | | | | | | | For example, GitLab can add any Kubernetes cluster with "Add Existing"
* | Merge branch 'docs/api-oauth-refactor' into 'master'Evan Read2019-01-141-78/+124
|\ \ | | | | | | | | | | | | Refactor the API OAuth docs See merge request gitlab-org/gitlab-ce!24295
| * | Refactor the API OAuth docsAchilleas Pipinellis2019-01-141-78/+124
|/ /
* | Merge branch 'docs-project-members-comma' into 'master'Evan Read2019-01-141-1/+1
|\ \ | | | | | | | | | | | | Documentation: In Project Members page, add serial comma See merge request gitlab-org/gitlab-ce!24348
| * | Add serial commaMike Lewis2019-01-131-1/+1
| | |
* | | Merge branch 'docs/fix-codeblock-markdown' into 'master'Evan Read2019-01-141-13/+13
|\ \ \ | |/ / |/| | | | | | | | Fix indentation and markup for Markdown codeblock See merge request gitlab-org/gitlab-ce!24321
| * | Fix indentation and markup for Markdown codeblockAchilleas Pipinellis2019-01-111-13/+13
| | |
* | | Merge branch 'patch-37' into 'master'Mike Lewis2019-01-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | docs: emoji cheat sheet with shortcodes Closes #42672 See merge request gitlab-org/gitlab-ce!24320
| * | | emoji cheat sheet with shortcodes (#42672)Stefan Schmalzhaf2019-01-111-1/+1
| | | |
* | | | Merge branch 'qa-fix-deploy-key-test' into 'master'Lin Jen-Shin2019-01-124-23/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix add_deploy_key_spec.rb Closes gitlab-org/quality/nightly#29 See merge request gitlab-org/gitlab-ce!24311
| * | | | Fix deploy key testMark Lapierre2019-01-114-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch a specific key's fingerprint instead of all fingerprints. Check for the specific key by title and expected fingerprint. This avoids the use of `all`, which can be unreliable.
* | | | | Merge branch 'danger_commit_message_errors' into 'master'Robert Speicher2019-01-121-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Danger commit message errors See merge request gitlab-org/gitlab-ce!24337
| * | | | | Fix Danger commit message errorsDrew Blessing2019-01-111-3/+3
| | | | | |
* | | | | | Merge branch 'jivl-update-placeholder-sentry-config' into 'master'Clement Ho2019-01-123-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update url placeholder for the sentry configuration page Closes #56276 See merge request gitlab-org/gitlab-ce!24338
| * | | | | | Update url placeholder for the sentry configJose Vargas2019-01-113-2/+7
| | | | | | |
* | | | | | | Merge branch ↵Mike Greiling2019-01-112-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55884-adjust-emoji-and-cancel-buttons-height-in-user-status-modal-when-emoji-is-changed' into 'master' Adjust emoji and cancel buttons height in user status modal when emoji is changed Closes #55884 See merge request gitlab-org/gitlab-ce!24173
| * | | | | | Emoji and cancel button are taller than input in set user status modalDhiraj Bodicherla2019-01-062-0/+9
| | | | | | |
* | | | | | | Merge branch '37990-task-list-bracket' into 'master'Clement Ho2019-01-115-8/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow brackets in task lists Closes #56083, #45599, and #37990 See merge request gitlab-org/gitlab-ce!18514
| * | | | | | | Add changelog entryJared Deckard2019-01-111-0/+5
| | | | | | | |
| * | | | | | | Fix ambiguous brackets in task listsJared Deckard2019-01-114-8/+8
| | | | | | | |
* | | | | | | | Merge branch 'error_tracking_feature_flag_fe' into 'master'Clement Ho2019-01-1117-0/+483
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | List Sentry Errors in GitLab - Frontend Closes #55178 See merge request gitlab-org/gitlab-ce!23770
| * | | | | | | List Sentry Errors in GitLab - FrontendSimon Knox2019-01-1117-0/+483
|/ / / / / / /
* | | | | | | Merge branch 'sec-dev-workflow-rc' into 'master'Robert Speicher2019-01-111-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create an MR for RCs when preparing security MRs See merge request gitlab-org/gitlab-ce!24319
| * | | | | | | Create an MR for RCs when preparing security MRsNick Thomas2019-01-111-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'sh-fix-import-export-text-page' into 'master'Robert Speicher2019-01-112-2/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove Webhooks from import/export help See merge request gitlab-org/gitlab-ce!24314
| * | | | | | | Remove Webhooks from import/export helpStan Hu2019-01-102-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We dropped Webhooks from import/export in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24121, but the online help still shows it's there.
* | | | | | | | Merge branch 'deprecated-force-reload' into 'master'Robert Speicher2019-01-115-6/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deprecation: Passing an argument to force an association to reload is now deprecated See merge request gitlab-org/gitlab-ce!24136
| * | | | | | | | Fix deprecation: Passing an argument to force an association to reload is ↵Jasper Maes2019-01-115-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now deprecated
* | | | | | | | | Merge branch 'winh-add-list-dropdown-height' into 'master'Clement Ho2019-01-114-5/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust height of "Add list" dropdown in issue boards Closes #56077 See merge request gitlab-org/gitlab-ce!24227
| * | | | | | | | Adjust height of "Add list" dropdown in issue boardsWinnie Hellmann2019-01-094-5/+10
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/uplift-applications-api-doc' into 'master'Achilleas Pipinellis2019-01-112-20/+36
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more information and refactor format of topic See merge request gitlab-org/gitlab-ce!24212
| * | | | | | | | | Add more information and refactor format of topicEvan Read2019-01-112-20/+36
|/ / / / / / / / /
* | | | | | | | | Merge branch '9070-refactor-specs' into 'master'Stan Hu2019-01-112-207/+118
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor epics/issues API specs See merge request gitlab-org/gitlab-ce!24302
| * | | | | | | | | Refactor epics/issues API specsDouglas Barbosa Alexandre2019-01-102-207/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the epics/issues API specs to remove code duplication.
* | | | | | | | | | Merge branch '56172/docs-fix-add-include-to-ci-param-list' into 'master'Achilleas Pipinellis2019-01-112-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CI YAML parameter table w/ 'include' Closes #56172 See merge request gitlab-org/gitlab-ce!24309
| * | | | | | | | | | Update CI YAML parameter table w/ 'include'Lucas Charles2019-01-102-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56172
* | | | | | | | | | | Merge branch 'danger-shorten-short-commit-warning' into 'master'Yorick Peterse2019-01-111-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten danger 50 char commit warning See merge request gitlab-org/gitlab-ce!24317
| * | | | | | | | | | Shorten danger 50 char commit warningPaul Slaughter2019-01-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also pulls URLs into vars
* | | | | | | | | | | Merge branch 'remove-get-builds-method' into 'master'Grzegorz Bizon2019-01-114-29/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove get_build method for find_by_id See merge request gitlab-org/gitlab-ce!24271
| * | | | | | | | | | | Remove get_build method for find_by_idSteve Azzopardi2019-01-094-29/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original intention of `get_build` was as a workaround not to violate `CodeReuse/ActiveRecord`. `find_by_id` does the exact same thing but does not violate the rubocop rule.
* | | | | | | | | | | | Merge branch 'docs-serverless-function-sample' into 'master'Mike Lewis2019-01-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to sample project for functions See merge request gitlab-org/gitlab-ce!24323
| * | | | | | | | | | | | Add link to sample projectdanielgruesso2019-01-111-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix-udpate-head-pipeline-method' into 'master'Grzegorz Bizon2019-01-113-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unexpected exception by failure of finding an actual head pipeline Closes #56113 See merge request gitlab-org/gitlab-ce!24257
| * | | | | | | | | | | | Fix unexpected exception by failed to find an actual head pipelineShinya Maeda2019-01-103-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog
* | | | | | | | | | | | | Merge branch 'zj-nillify-pool-repo-when-leaving' into 'master'Douwe Maan2019-01-113-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nullify pool_repository when a project leaves See merge request gitlab-org/gitlab-ce!24225
| * | | | | | | | | | | | | Nullify pool_repository when a project leavesZeger-Jan van de Weg2019-01-113-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the nullification wasn't done, as the only caller would later destroy the model all together. In https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9070 this change was made. This commit is basically a backport before that MR is merged.
* | | | | | | | | | | | | | Merge branch 'notebook-multiple-outputs' into 'master'Filipa Lacerda2019-01-1110-87/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support multiple outputs in Jupyter notebooks Closes #32588 and #31910 See merge request gitlab-org/gitlab-ce!24263