summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-112-38/+7
| | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* Align UrlValidator to validate_url gem implementation.Thong Kuah2019-04-112-6/+6
| | | | | | | Renamed UrlValidator to AddressableUrlValidator to avoid 'url:' naming collision with ActiveModel::Validations::UrlValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: allow_nil, allow_blank, message. Renamed 'protocols' option to 'schemes' to match the option naming from UrlValidator.
* Removed also the in the meanwhile introduced rake taskTim Zallmann2019-04-101-9/+1
|
* Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loadingTim Zallmann2019-04-101-5/+10
| | | | Reverts the loading of emojis and its images to move forward with RC
* Merge branch '47327-fix-github-project-import-visibility' into 'master'Douwe Maan2019-04-101-1/+1
|\ | | | | | | | | Fix GitHub project import visibility See merge request gitlab-org/gitlab-ce!27133
| * Fix GitHub project import visibilityDaniel Wyatt2019-04-081-1/+1
| |
* | Add more info logging to cluster appsDylan Griffith2019-04-101-0/+29
| | | | | | | | | | Log events so that it's easy to see when different requests are starting.
* | Merge branch 'docs-zj-update-n-plus-one-comments' into 'master'Douglas Barbosa Alexandre2019-04-091-1/+1
|\ \ | | | | | | | | | | | | Update comments about N + 1 Gitaly calls See merge request gitlab-org/gitlab-ce!27178
| * | Update comments about N + 1 Gitaly callsZeger-Jan van de Weg2019-04-091-1/+1
| | | | | | | | | | | | | | | To make sure all known issues are linked to the correct epic, I've gone through the code base, and updated the comments where required.
* | | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-0910-3/+335
| | | | | | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* | | Merge branch 'osw-multi-assignees-merge-requests' into 'master'Nick Thomas2019-04-095-9/+14
|\ \ \ | | | | | | | | | | | | | | | | [Backport] Support multiple assignees for merge requests See merge request gitlab-org/gitlab-ce!27089
| * | | [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-085-9/+14
| | | | | | | | | | | | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | | | Add new permission model `read-pipeline-variable`Agustin Henze2019-04-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Used to get the variables via the API endpoint `/projects/:id/pipelines/:pipeline_id/variables` Signed-off-by: Agustin Henze <tin@redhat.com>
* | | | Merge branch '43263-git-push-option-to-create-mr' into 'master'Nick Thomas2019-04-096-17/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git push options to create a merge request, set target_branch and set merge when pipeline succeeds Closes #53198 and #43263 See merge request gitlab-org/gitlab-ce!26752
| * | | | Feature flag for merge requestion push optionsLuke Duncalfe2019-04-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/43263 https://gitlab.com/gitlab-org/gitlab-ce/issues/53198
| * | | | Refactor PushOptionsHandlerService from reviewLuke Duncalfe2019-04-092-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exceptions are no longer raised, instead all errors encountered are added to the errors property. MergeRequests::BuildService is used to generate attributes of a new merge request. Code moved from Api::Internal to Api::Helpers::InternalHelpers.
| * | | | Support merge on pipeline success w/ push optionsLuke Duncalfe2019-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `merge_when_pipeline_succeeds` set using git push options. To create a new merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.create \ -o merge_request.merge_when_pipeline_succeeds To update an existing merge request and set it to merge when the pipeline succeeds: git push -u origin -o merge_request.merge_when_pipeline_succeeds Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/53198
| * | | | Use Gitlab::PushOptions for `ci.skip` push optionLuke Duncalfe2019-04-095-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the raw push option Array was sent to Pipeline::Chain::Skip. This commit updates this class (and the chain of classes that pass the push option parameters from the API internal `post_receive` endpoint to that class) to treat push options as a Hash of options parsed by GitLab::PushOptions. The GitLab::PushOptions class takes options like this: -o ci.skip -o merge_request.create -o merge_request.target=branch and turns them into a Hash like this: { ci: { skip: true }, merge_request: { create: true, target: 'branch' } } This now how Pipeline::Chain::Skip is determining if the `ci.skip` push option was used.
| * | | | Support merge request create with push optionsLuke Duncalfe2019-04-093-7/+99
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To create a new merge request: git push -u origin -o merge_request.create To create a new merge request setting target branch: git push -u origin -o merge_request.create \ -o merge_request.target=123 To update an existing merge request with a new target branch: git push -u origin -o merge_request.target=123 A new Gitlab::PushOptions class handles parsing and validating the push options array. This can be the start of the standard of GitLab accepting push options that follow namespacing rules. Rules are discussed in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/43263. E.g. these push options: -o merge_request.create -o merge_request.target=123 Become parsed as: { merge_request: { create: true, target: '123', } } And are fetched with the class via: push_options.get(:merge_request) push_options.get(:merge_request, :create) push_options.get(:merge_request, :target) A new MergeRequests::PushOptionsHandlerService takes the `merge_request` namespaced push options and handles creating and updating merge requests. Any errors encountered are passed to the existing `output` Hash in Api::Internal's `post_receive` endpoint, and passed to gitlab-shell where they're output to the user. Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/43263
* | | | Merge branch 'osw-schedule-multiple-mr-assignees-ff-auto-enabling' into 'master'Yorick Peterse2019-04-091-6/+22
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add methods to check dead and retrying jobs See merge request gitlab-org/gitlab-ce!27149
| * | | Add methods to check dead and retrying jobsosw-schedule-multiple-mr-assignees-ff-auto-enablingOswaldo Ferreira2019-04-081-6/+22
| |/ / | | | | | | | | | | | | It adds two methods for checking if a background job (for a given class) has dead or retrying jobs.
* | | Add environment url validationWolphin2019-04-091-0/+2
| | |
* | | Add new API endpoint to expose single environmentKrasimir Angelov2019-04-092-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | This is resolving https://gitlab.com/gitlab-org/gitlab-ce/issues/30157. Implement new API endpoint `/projects/:id/environments/:environment_id` to expose single environment. Include information for environment's last deployment if there is one.
* | | Set release name when adding release notes to an existing tagJason Goodman2019-04-091-0/+1
|/ / | | | | | | Also set the release sha and author
* | Merge branch 'sh-fix-issue-59985' into 'master'Michael Kozono2019-04-081-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix stage index migration failing in PostgreSQL 10 Closes #59985 See merge request gitlab-org/gitlab-ce!26972
| * | Fix stage index migration failing in PostgreSQL 10sh-fix-issue-59985Stan Hu2019-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in https://www.postgresql.org/message-id/9922.1353433645%40sss.pgh.pa.us, the PostgreSQL window function last_value may not consider the right rows: Note that first_value, last_value, and nth_value consider only the rows within the "window frame", which by default contains the rows from the start of the partition through the last peer of the current row. This is likely to give unhelpful results for last_value and sometimes also nth_value. You can redefine the frame by adding a suitable frame specification (RANGE or ROWS) to the OVER clause. See Section 4.2.8 for more information about frame specifications. This query could be fixed by adding `RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING`, but that's quite verbose. It's simpler just to use the first_value function. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59985
* | | Merge branch 'fix-pull-request-importer' into 'master'Kamil Trzciński2019-04-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Improve performance of PR import See merge request gitlab-org/gitlab-ce!27121
| * | | Improve performance of PR importfix-pull-request-importerKamil Trzciński2019-04-081-1/+1
| | |/ | |/| | | | | | | | | | | | | This removes unneeded `.reload` call which makes AR to load ALL objects, and create its in-memory representation.
* | | Fix `updated_at` doesn't apply to `state_event` updates of issues via APISean McGivern2019-04-081-3/+7
|/ /
* | GitHub import: Run housekeeping after initial importsh-git-gc-after-initial-fetchStan Hu2019-04-071-0/+5
| | | | | | | | | | | | | | | | | | After an initial fetch, the repository will have many loose objects and refs. Running a `git gc` will compact refs into `packed-refs` and objects into `.pack` files, which should make importing pull requests faster. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/59477
* | Handle possible HTTP exception for Sentry clientPeter Leitzen2019-04-071-3/+27
| | | | | | | | | | | | | | | | | | | | | | Prior this commit exceptions raised during a HTTP request weren't caught by the Sentry client and were passed to the user. In addition the Sentry client tried to catch a non-existent error `Sentry::Client::SentryError`. Now, the Sentry client catches all possible errors coming from a HTTP request.
* | Restore original Security/DAST.gitlab-ci.ymlTiger Watson2019-04-063-62/+51
| | | | | | | | | | Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26520 for Security/DAST.gitlab-ci.yml.
* | Merge branch '58612-clean-up-notes-data' into 'master'Stan Hu2019-04-061-8/+11
|\ \ | | | | | | | | | | | | | | | | | | Clean up `noteable_id` for notes on commits Closes #58612 See merge request gitlab-org/gitlab-ce!26104
| * | Clean up `noteable_id` for notes on commits58612-clean-up-notes-dataHeinrich Lee Yu2019-04-061-8/+11
| | | | | | | | | | | | | | | | | | | | | This was incorrectly set by a bug in: https://gitlab.com/gitlab-org/gitlab-ce/issues/54924 Also adds a `batch_size` option to `update_column_in_batches`
* | | Add Knative metrics to PrometheusChris Baumbauer2019-04-061-0/+39
|/ /
* | Merge branch 'sh-fix-realtime-changes-with-reserved-words' into 'master'Douglas Barbosa Alexandre2019-04-051-11/+12
|\ \ | | | | | | | | | | | | | | | | | | Fix real-time updates for projects that contain a reserved word Closes #60113 See merge request gitlab-org/gitlab-ce!27060
| * | Fix real-time updates for projects that contain a reserved wordStan Hu2019-04-051-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Projects that included reserved words (e.g. test-create) would fail to generate a proper ETag key because of the name. To fix this, we add forward slashes to match the exact name so that /test-create doesn't get matched, but /create does. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60113
* | | Merge branch 'ce-10546-fix-epic-depth-validation' into 'master'Douglas Barbosa Alexandre2019-04-051-10/+52
|\ \ \ | | | | | | | | | | | | | | | | [CE-port] Fix Epic depth validation See merge request gitlab-org/gitlab-ce!26390
| * | | Prevent infinite loops in ObjectHierarchyce-10546-fix-epic-depth-validationHeinrich Lee Yu2019-04-051-4/+23
| | | |
| * | | Adds max_descendants_depth to ObjectHierarchyHeinrich Lee Yu2019-04-051-10/+33
| | | | | | | | | | | | | | | | CE-port of 10546-fix-epic-depth-validation
* | | | Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'"Mayra Cabrera2019-04-051-2/+2
| | | | | | | | | | | | | | | | This reverts merge request !26991
* | | | Merge branch 'duplicate-related-mrs' into 'master'Michael Kozono2019-04-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove duplicates from issue related merge requests See merge request gitlab-org/gitlab-ce!27067
| * | | | Remove duplicates from issue related merge requestsduplicate-related-mrsAlexandru Croitor2019-04-051-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicates returned by Issues#related_merge_requests API that relies on ReferencedMergeRequestsService which returns 2 arrays one of related MRs and one of related MRs that close the issue(i.e. a subset of first one). We only need related MRs in this case so just pick the first array.
* | | | Add part of needed codeGosia Ksionek2019-04-052-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* | | | Merge branch 'feature/gb/serverless-switch-to-gitlabktl' into 'master'Kamil Trzciński2019-04-051-5/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Serverless backend now uses `gitlabktl` tool Closes #56252 and #58058 See merge request gitlab-org/gitlab-ce!26926
| * | | Build and deploy serverless functions with gitlabktlGrzegorz Bizon2019-04-031-5/+8
| | | |
* | | | Merge branch 'revert-3962b00b' into 'master'Andreas Brandl2019-04-0510-335/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'" See merge request gitlab-org/gitlab-ce!27051
| * | | | Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"Andreas Brandl2019-04-0510-335/+3
| | | | | | | | | | | | | | | This reverts merge request !26823
* | | | | Revert "Merge branch 'require-all-templates-to-include-default-stages' into ↵Sean McGivern2019-04-0515-29/+13
|/ / / / | | | | | | | | | | | | | | | | 'master'" This reverts merge request !26954
* | | | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-0510-3/+335
| | | | | | | | | | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE