summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CE port of EE MR6861-group-level-project-templates-QA-tests-take-2-ceSanad Liaquat2019-01-084-2/+13
|
* Merge branch '3845-committers-cannot-approve-mr-ce' into 'master'Douwe Maan2019-01-086-10/+77
|\ | | | | | | | | Add committers and authors methods on MergeRequest See merge request gitlab-org/gitlab-ce!24204
| * Add committers and authors methods on MergeRequestTiago Botelho2019-01-086-10/+77
| | | | | | | | These are used by the EE-only approvers feature
* | Merge branch ↵Evan Read2019-01-082-1/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'docs/52681-add-documentation-about-how-web-terminals-are-secured' into 'master' Add docs on how web terminals are secured Closes #52681 See merge request gitlab-org/gitlab-ce!24099
| * | Add docs on how web terminals are secureddocs/52681-add-documentation-about-how-web-terminals-are-securedSteve Azzopardi2019-01-072-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the administration page for web terminals add a new `Security` section explaining how the interactive web terminals are secured between GitLab and gitlab-runner. This section is under administration instead of `doc/ci/interactive_web_terminal` because the administrators of the GitLab instance would be mostly interested in this, whilst `doc/ci/interactive_web_terminal` are interested in how the feature works. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52681
* | | Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'Robert Speicher2019-01-082-9/+51
|\ \ \ | | | | | | | | | | | | | | | | CE backport of gitlab-ee!8936 See merge request gitlab-org/gitlab-ce!23976
| * | | CE backport for `reference` in gfm_autocompletece-5606-issues-and-mr-autocomplete-in-epicsHeinrich Lee Yu2019-01-072-9/+51
| | | | | | | | | | | | | | | | Currently not used by any CE code
* | | | Merge branch 'patch-37' into 'master'Evan Read2019-01-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Link highlighting of jon.doe@example.com swallowed the trailing backtick, destroying formatting. See merge request gitlab-org/gitlab-ce!24133
| * | | | Link highlighting of jon.doe@example.com swallowed the trailing backtick, ↵Adam Smith2019-01-081-1/+1
|/ / / / | | | | | | | | | | | | destroying formatting.
* | | | Merge branch ↵Mike Lewis2019-01-085-57/+95
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29951-support-new-issue-creation-by-email-without-subaddressing-docs' into 'master' Document new incoming email address format See merge request gitlab-org/gitlab-ce!23991
| * | | | Document new incoming email address formatBrett Walker2019-01-085-57/+95
|/ / / /
* | | | Merge branch '53966-hashed-storage-read-only' into 'master'Douglas Barbosa Alexandre2019-01-086-22/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Hashed Storage: Only set as `read_only` when starting the per-project migration See merge request gitlab-org/gitlab-ce!24128
| * | | | Only set as `read_only` when starting the per-project migration53966-hashed-storage-read-onlyGabriel Mazetto2019-01-076-22/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the previous code, we locked the project during the migration scheduling step, which works fine for small setups, but can be problematic in really big installations. We now moved the logic to inside the worker, so we minimize the time a project will be read-only. We also make sure we only do that if reference counter is `0` (no current operation is in progress).
* | | | | Merge branch 'doc-merge_base' into 'master'Evan Read2019-01-071-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fix doc for "Allow getting the merge base of multiple revisions" See merge request gitlab-org/gitlab-ce!24051
| * | | | Fix doc for "Allow getting the merge base of multiple revisions"Mathieu Parent2018-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | See 71d71afb3ac5f302470e66ace4f59e247249d99e
* | | | | Merge branch '49231-import-issues-csv' into 'master'Douwe Maan2019-01-0740-31/+563
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import issues from CSV Closes #49231 See merge request gitlab-org/gitlab-ce!23532
| * | | | | Remove caching of CSV file49231-import-issues-csvHeinrich Lee Yu2019-01-079-31/+23
| | | | | | | | | | | | | | | | | | | | | | | | Load whole file in memory to simplify code
| * | | | | Improve email messagesHeinrich Lee Yu2019-01-0710-31/+28
| | | | | | | | | | | | | | | | | | | | | | | | Also refactored cleanup view to use the same localized string
| * | | | | Refactor upload service to return uploaderHeinrich Lee Yu2019-01-077-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | Also changes old calls to the service
| * | | | | Add CSV Import documentationHeinrich Lee Yu2019-01-074-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | Document importing of CSVs with format information and sample data
| * | | | | Import CSV BackendHeinrich Lee Yu2019-01-0721-12/+381
| | | | | | | | | | | | | | | | | | | | | | | | Process CSV uploads async using a worker then email results
| * | | | | Add Import CSV FrontendHeinrich Lee Yu2019-01-0713-53/+138
| | |_|/ / | |/| | | | | | | | | | | | | Added button and modal to accept CSV file for uploading
* | | | | Merge branch 'fix-qa-auto-devops-before-all' into 'master'Kamil Trzciński2019-01-071-26/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QA spec sharing project in the wrong context Closes gitlab-org/quality/nightly#54 See merge request gitlab-org/gitlab-ce!24183
| * | | | | Auto Devops -> Auto DevOpsThong Kuah2019-01-081-2/+2
| | | | | |
| * | | | | Fix QA spec sharing project in the wrong contextThong Kuah2019-01-071-26/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | In CE we can only have one cluster per project, so create a new project for each case of rbac disabled and enabled.
* | | | | Merge branch 'gt-externalize-app-views-shared-notes' into 'master'Fatih Acet2019-01-079-35/+104
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/shared/notes` See merge request gitlab-org/gitlab-ce!23696
| * | | | | Externalize strings from `/app/views/shared/notes`George Tsiolis2019-01-079-35/+104
|/ / / / /
* | | | | Merge branch 'ce-7407-label-quick-epics' into 'master'Lin Jen-Shin2019-01-074-15/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE port: Use parent instead of project for quick actions See merge request gitlab-org/gitlab-ce!24124
| * | | | | Use parent instead of projectJarka Košanová2019-01-084-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | Add support for group entities to quick actions
* | | | | | Merge branch '55177-sentry-configuration' into 'master'Kamil Trzciński2019-01-0711-14/+361
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Sentry Configuration" See merge request gitlab-org/gitlab-ce!23724
| * | | | | | Implement error tracking configurationPeter Leitzen2019-01-076-14/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use operations controller which already handles tracing settings.
| * | | | | | Add error tracking setting partialPeter Leitzen2019-01-072-0/+31
| | | | | | |
| * | | | | | Update text to match UX changesTristan Read2019-01-071-0/+21
| | | | | | |
| * | | | | | Add view and feature test for error tracking settingsTristan Read2019-01-073-0/+79
| |/ / / / /
* | | | | | Merge branch 'docs/avoid-redirected-geo-links' into 'master'Achilleas Pipinellis2019-01-073-15/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid redirected Geo links See merge request gitlab-org/gitlab-ce!24138
| * | | | | | Avoid redirected Geo linksdocs/avoid-redirected-geo-linksEvan Read2019-01-043-15/+15
| | | | | | |
* | | | | | | Merge branch '7061_store_container_scanning_reports_in_db_be-ce' into 'master'Stan Hu2019-01-071-10/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Container Scaning report fixture from EE See merge request gitlab-org/gitlab-ce!23836
| * | | | | | | Use Container Scaning report fixture from EE7061_store_container_scanning_reports_in_db_be-ceGilbert Roulot2019-01-071-10/+84
| | | | | | | |
* | | | | | | | Merge branch '54974-set-threshold-lines-in-metrics-graph' into 'master'Tim Zallmann2019-01-074-9/+18
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add threshold lines in metrics graph Closes #54978 and #56021 See merge request gitlab-org/gitlab-ce!24169
| * | | | | | | Add threshold lines in metrics graphAdriel Santiago2019-01-074-9/+18
|/ / / / / / /
* | | | | | | Merge branch '55178-db_and_model' into 'master'Sean McGivern2019-01-0715-3/+177
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add table and model for error tracking settings See merge request gitlab-org/gitlab-ce!24047
| * | | | | | | Add table and model for error tracking settingsReuben Pereira2019-01-0715-3/+177
|/ / / / / / /
* | | | | | | Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'Phil Hughes2019-01-071-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Ctrl+Enter immediately adds MR comment" See merge request gitlab-org/gitlab-ce!24053
| * | | | | | | Added handleKeySubmit method to match EE8535-add-mr-comment-on-ctrl-enterNatalia Tepluhina2019-01-071-2/+5
| | | | | | | |
* | | | | | | | Merge branch '55192-about-link-in-new-window' into 'master'Phil Hughes2019-01-072-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""About this feature" link should open in new window" Closes #55192 See merge request gitlab-org/gitlab-ce!24149
| * | | | | | | | Resolve ""About this feature" link should open in new window"Natalia Tepluhina2019-01-072-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch '49056-auto-devops-secret-docs' into 'master'Marcia Ramos2019-01-072-0/+75
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Document Auto DevOps secret variables See merge request gitlab-org/gitlab-ce!23970
| * | | | | | | Remove release from body and add linksdanielgruesso2019-01-071-3/+2
| | | | | | | |
| * | | | | | | Apply suggestion to doc/topics/autodevops/index.md49056-auto-devops-secret-docsThong Kuah2019-01-071-5/+5
| | | | | | | |
| * | | | | | | Apply suggestion to doc/ci/variables/README.mdThong Kuah2019-01-071-1/+1
| | | | | | | |
View Lorry Controller Status