summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Adds new metrics for unicorn monitoringRyan Cobb2019-04-182-8/+53
| | | | | | This adds new metrics for monitoring unicorn. These metrics include process_cpu_seconds_total, process_start_time_seconds, process_max_fds, and unicorn_workers.
* Fix remove_source_branch merge request API handlingsh-fix-merge-requests-api-remove-branch-paramStan Hu2019-04-151-1/+1
| | | | | | | | | Users attempting to set merge requests to `remove_source_branch` to `false` would encounter an Error 500 because the UpdateService and API checked `present?`, which would always return `false`. We now just use `has_key?` to decide whether the parameter is present. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60530
* Merge branch 'forbid-the-usage-of-reload' into 'master'Lin Jen-Shin2019-04-154-6/+6
|\ | | | | | | | | | | | | Forbid the usage of reload Closes #60218 See merge request gitlab-org/gitlab-ce!27125
| * Forbid the use of `#reload` and prefer `#reset`forbid-the-usage-of-reloadKamil Trzciński2019-04-154-6/+6
| | | | | | | | | | | | | | The `#reload` makes to load all objects into memory, and the main purpose of `#reload` is to drop the association cache. The `#reset` seems to solve exactly that case.
* | Merge branch 'osw-remote-multi-line-suggestions-ff' into 'master'Lin Jen-Shin2019-04-151-12/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove multi-line suggestions feature flag Closes #59178 See merge request gitlab-org/gitlab-ce!27219
| * | Remove multi-line suggestions feature flagosw-remote-multi-line-suggestions-ffOswaldo Ferreira2019-04-101-12/+0
| | | | | | | | | | | | That's a straightforward feature flag code removal for 11.10
* | | Merge branch 'zj-fsck-no-timeout' into 'master'Nick Thomas2019-04-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Git FSCK has no timeout Closes #53319 See merge request gitlab-org/gitlab-ce!27299
| * | | Git FSCK has no timeoutzj-fsck-no-timeoutZeger-Jan van de Weg2019-04-151-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | FSCK is usually called through sidekiq, but a rake task doesn't have a mechanism to default to no timeout for this RPC. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53319
* | | Merge branch 'sh-validate-ref-name-in-commit' into 'master'Rémy Coutable2019-04-151-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Validate refs used in controllers don't have spaces Closes #58572 and gitaly#1425 See merge request gitlab-org/gitlab-ce!24037
| * | | Validate refs used in controllers don't have spacessh-validate-ref-name-in-commitStan Hu2019-04-141-0/+3
| |/ / | | | | | | | | | | | | | | | | | | This avoids an unnecessary call to Gitaly and reduces gRPC errors. * Closes https://gitlab.com/gitlab-org/gitaly/issues/1425 * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58572
* | | Added write_repository scope for personal access tokenHoratiu Eugen Vlad2019-04-151-12/+28
| | |
* | | Merge branch 'require-all-templates-to-include-default-stages' into 'master'Sean McGivern2019-04-1515-13/+29
|/ / | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | Added changelog and rebased
* | Merge branch 'patch-31' into 'master'Stan Hu2019-04-111-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Add missing provider_unauthorized method to import_github.rb Closes #60347 See merge request gitlab-org/gitlab-ce!27218
| * | Return a `401` error codeBen2019-04-111-1/+1
| | |
| * | Fix trailing white spaceBen2019-04-101-1/+1
| | |
| * | Add missing provider_unauthroized method to import_github.rb Ben2019-04-101-0/+4
| |/
* | Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-111-0/+40
|\ \ | | | | | | | | | | | | | | | | | | 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-101-0/+40
| |/ | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | Merge branch 'revert-24704-download-repository-path' into 'master'Rémy Coutable2019-04-112-38/+7
|\ \ | | | | | | | | | | | | 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-38/+7
| | | | | | | | | | | | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* | | Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'Sean McGivern2019-04-111-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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-1/+1
| | |
* | | 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.