summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Un-quarantine speccherry-pick-39eb16aaKamil Trzciński2019-04-151-3/+3
|
* Merge branch 'require-all-templates-to-include-default-stages' into 'master'Sean McGivern2019-04-152-37/+30
| | | | | | | | | | | Require all templates to use default stages Closes #59992 See merge request gitlab-org/gitlab-ce!26954 (cherry picked from commit 39eb16aab2dbac3347f61f83fb60f5448d44e965) e0df05cf Require all templates to use default stages
* Squashed commits and modified visibility level outputSara Ahbabou2019-04-121-0/+8
| | | | Added changelog and rebased
* Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-112-0/+23
|\ | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
| * Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-102-0/+23
| | | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | Merge branch 'revert-24704-download-repository-path' into 'master'Rémy Coutable2019-04-112-29/+13
|\ \ | | | | | | | | | | | | Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27249
| * | Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-112-29/+13
| | | | | | | | | | | | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* | | Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'Sean McGivern2019-04-111-0/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Guard against nil dereferenced_target Closes #60076 See merge request gitlab-org/gitlab-ce!27192
| * | Guard against nil dereferenced_targetjc-guard-against-empty-dereferenced_targetJohn Cai2019-04-101-0/+7
| | |
* | | Align UrlValidator to validate_url gem implementation.Thong Kuah2019-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loadingTim Zallmann2019-04-101-1/+1
| |/ |/| | | | | 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-3/+13
|\ \ | | | | | | | | | | | | Fix GitHub project import visibility See merge request gitlab-org/gitlab-ce!27133
| * | Address style review commentDaniel Wyatt2019-04-091-2/+0
| | |
| * | Add test for github project import to user namespace.Daniel Wyatt2019-04-091-0/+12
| | |
| * | Fix GitHub project import visibilityDaniel Wyatt2019-04-081-2/+2
| | |
* | | Add more info logging to cluster appsDylan Griffith2019-04-101-0/+27
| |/ |/| | | | | | | Log events so that it's easy to see when different requests are starting.
* | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-097-0/+439
| | | | | | | | 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-5/+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-5/+14
| | | | | | | | | | | | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* | | Merge branch '43263-git-push-option-to-create-mr' into 'master'Nick Thomas2019-04-091-0/+103
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Use Gitlab::PushOptions for `ci.skip` push optionLuke Duncalfe2019-04-091-0/+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-091-0/+91
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+40
|\ \ \ | | | | | | | | | | | | | | | | 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-0/+40
| |/ / | | | | | | | | | | | | It adds two methods for checking if a background job (for a given class) has dead or retrying jobs.
* | | Reduce number of rspec retriesSanad Liaquat2019-04-091-1/+1
| | | | | | | | | | | | | | | In both e2e QA tests and unit tests, reduce the number of retires to 2 (i.e., 1 initial and one retry)
* | | Add environment url validationWolphin2019-04-091-0/+40
| | |
* | | 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-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Improve performance of PR importfix-pull-request-importerKamil Trzciński2019-04-081-0/+73
| |/ |/| | | | | | | | | This removes unneeded `.reload` call which makes AR to load ALL objects, and create its in-memory representation.
* | 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
* | Add Knative metrics to PrometheusChris Baumbauer2019-04-061-0/+26
| |
* | Merge branch 'sh-fix-realtime-changes-with-reserved-words' into 'master'Douglas Barbosa Alexandre2019-04-051-0/+18
|\ \ | | | | | | | | | | | | | | | | | | 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-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+40
|\ \ \ | | | | | | | | | | | | | | | | [CE-port] Fix Epic depth validation See merge request gitlab-org/gitlab-ce!26390
| * | | Adds max_descendants_depth to ObjectHierarchyHeinrich Lee Yu2019-04-051-0/+40
| | | | | | | | | | | | | | | | CE-port of 10546-fix-epic-depth-validation
* | | | Revert "Merge branch 'bump_kubernetes_1_11_9' into 'master'"Mayra Cabrera2019-04-051-1/+1
| |/ / |/| | | | | | | | This reverts merge request !26991
* | | Merge branch 'revert-3962b00b' into 'master'Andreas Brandl2019-04-057-439/+0
|\ \ \ | | | | | | | | | | | | | | | | 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-057-439/+0
| | | | | | | | | | | | This reverts merge request !26823
* | | | Revert "Merge branch 'require-all-templates-to-include-default-stages' into ↵Sean McGivern2019-04-052-30/+37
|/ / / | | | | | | | | | | | | 'master'" This reverts merge request !26954
* | | Move Contribution Analytics related spec in ↵Imre Farkas2019-04-057-0/+439
| | | | | | | | | | | | spec/features/groups/group_page_with_external_authorization_service_spec to EE
* | | Fall back to project repository type by defaultBob Van Landuyt2019-04-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that we always have a repository type when trying to parse a repository from a path. This is needed because sometimes we want to perform access checks as if the project already existed, for example when creating a project on push. Before this we were only doing that when accessing git over http, this makes sure it also works correctly when accessing git over SSH
* | | Merge branch 'require-all-templates-to-include-default-stages' into 'master'Sean McGivern2019-04-052-37/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Require all templates to use default stages Closes #59992 See merge request gitlab-org/gitlab-ce!26954
| * | | Require all templates to use default stagesKamil Trzciński2019-04-052-37/+30
| |/ / | | | | | | | | | | | | | | | Our templates are free to override the 'stages:'. However, they should follow the convention to always include 'build', 'test', 'deploy' which are defaults when not defined.
* | | Merge branch 'bump_kubernetes_1_11_9' into 'master'Douwe Maan2019-04-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Bump Helm to 2.13.1 and kubectl to 1.11.9 See merge request gitlab-org/gitlab-ce!26991
| * | | Bump Helm to 2.13.1 and kubectl to 1.11.9bump_kubernetes_1_11_9Thong Kuah2019-04-051-1/+1
| | |/ | |/|
* | | Autocorrect with RSpec/ExampleWording copThong Kuah2019-04-0530-125/+125
| | | | | | | | | | | | | | | | | | | | | - rewords examples starting with 'should' - rewords examples starting with 'it' Note: I had to manually fixup "onlies" to "only"
* | | Add a proxy method to PrometheusClientReuben Pereira2019-04-051-7/+72
| | | | | | | | | | | | | | | | | | | | | | | | - Also refactor the get and json_api_get methods so that the get method can be reused by the new proxy method. - The new proxy method makes no changes to the request to the prometheus server and response from the prometheus server. This allows it to be used as a proxy to the Prometheus server, hence the name.
* | | Merge branch '54506-show-error-when-namespace-svc-missing' into 'master'Grzegorz Bizon2019-04-052-0/+66
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show error when namespace/svc account missing Closes #54506 See merge request gitlab-org/gitlab-ce!26362
| * | | Detailed status for builds that fail prerequisitesTiger2019-04-022-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Create FailedUnmetPrerequisites status to allow custom messaging for builds that were unable to be queued due to failing to meet prerequisites (eg. failing to create Kubernetes namespace for deployment).