summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-095-22/+10
| | | | | | | | | | In Ruby 2.4, `URI.join("http://test//", "a").to_s` will remove the double slash, however it's not the case in Ruby 2.5. Using chomp should work better for the intention, as we're not trying to allow things like ../ or / paths resolution. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
* Remove circular dependency on Redactable in migrationStan Hu2018-11-092-17/+27
| | | | | | | | | Gitlab::BackgroundMigration::RedactLinks was prepending EE::Gitlab::BackgroundMigration::RedactLinks, while EE::Gitlab::BackgroundMigration::RedactLinks was trying to include Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed with an uninitialized constant (https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).
* Merge branch 'rs-cherry-pick-api' into 'master'Nick Thomas2018-11-091-3/+5
|\ | | | | | | | | | | | | Resolve possible cherry pick API race condition Closes #53773 See merge request gitlab-org/gitlab-ce!22946
| * Resolve possible cherry pick API race conditionrs-cherry-pick-apiRobert Speicher2018-11-091-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Previously, we just fetched the latest commit for the given branch when presenting the resulting commit, but because something could have been committed to that branch between the time we cherry-picked and the time we render the result, the wrong commit could have been presented. Now, we fetch the commit object with the commit SHA returned by the commit change service, which should always be the correct commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53773
* | Merge branch 'frozen-string-lib-gitlab-more' into 'master'Rémy Coutable2018-11-09101-5/+209
|\ \ | | | | | | | | | | | | Enable even more frozen string in lib/gitlab See merge request gitlab-org/gitlab-ce!22863
| * | Enable even more frozen string in lib/gitlabgfyoung2018-11-06101-5/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozens string for the following: * lib/gitlab/conflict/**/*.rb * lib/gitlab/cross_project_access/**/*.rb * lib/gitlab/cycle_analytics/**/*.rb * lib/gitlab/data_builder/**/*.rb * lib/gitlab/database/**/*.rb * lib/gitlab/dependency_linker/**/*.rb * lib/gitlab/diff/**/*.rb * lib/gitlab/downtime_check/**/*.rb * lib/gitlab/email/**/*.rb * lib/gitlab/etag_caching/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | | Merge branch 'rs-revert-api' into 'master'Nick Thomas2018-11-091-0/+34
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
| * | Add revert to commits APIRobert Speicher2018-11-091-0/+34
| | |
* | | Improve Debugging Capabilities For Helm Application InstallsDylan Griffith2018-11-094-7/+7
|/ /
* | Limit parallel to 100limit-parallel-to-100Kamil Trzciński2018-11-081-1/+2
| | | | | | | | This prevents some of the abusive behaviors, of someone putting 100000 and creating out of memory condition easily
* | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-074-275/+4
| | | | | | | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* | Merge branch 'sh-paginate-bitbucket-server-imports' into 'master'Douglas Barbosa Alexandre2018-11-073-10/+49
|\ \ | | | | | | | | | | | | Paginate Bitbucket Server importer projects See merge request gitlab-org/gitlab-ce!22825
| * | Paginate Bitbucket Server importer projectsStan Hu2018-11-073-10/+49
| | | | | | | | | | | | | | | | | | | | | To prevent delays in loading the page and reduce memory usage, limit the number of projects shown at 25 per page. Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/50021
* | | Merge branch 'jira-ping-differentiate-cloud' into 'master'Sean McGivern2018-11-071-1/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Usage ping - Differentiate Jira Server and Cloud Closes #51043 See merge request gitlab-org/gitlab-ce!22791
| * | | Usage ping - Differentiate Jira Server and Cloudjira-ping-differentiate-cloudMario de la Ossa2018-11-071-1/+17
| | | |
* | | | Allow limiting quick actions to executeBob Van Landuyt2018-11-071-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Sometimes we don't want to trigger any quick actions that cause side effects. For example when building a record to validate. This allows listing the quick actions that need to be performed.
* | | | Apply patches when creating MR via emailBob Van Landuyt2018-11-076-2/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to add patches as attachments to merge request created via email. When an email to create a merge request is sent, all the attachments ending in `.patch` will be applied to the branch specified in the subject of the email. If the branch did not exist, it will be created from the HEAD of the repository. When the patches could not be applied, the error message will be replied to the user. The patches can have a maximum combined size of 2MB for now.
* | | | Merge branch 'fj-41213-api-update-submodule-commit' into 'master'Sean McGivern2018-11-074-0/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add endpoint to update a git submodule reference Closes #41213 See merge request gitlab-org/gitlab-ce!20949
| * | | | Add submodule update API endpointFrancisco Javier López2018-11-074-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new endpoint allow users to update a submodule's reference. The MR involves adding a new operation RPC operation in gitaly-proto (see gitlab-org/gitaly-proto!233) and change Gitaly to use this new version (see gitlab-org/gitaly!936). See gitlab-org/gitlab-ce!20949
* | | | | Merge branch 'max_retries_when' into 'master'Grzegorz Bizon2018-11-073-8/+115
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to configure when to retry builds Closes gitlab-runner#3515 See merge request gitlab-org/gitlab-ce!21758
| * | | | | use Ci::Build instead of CommitStatus as per feedbackMarkus Doits2018-11-071-1/+1
| | | | | |
| * | | | | small fixes to doc and remove on whitespace noiseMarkus Doits2018-11-071-2/+0
| | | | | |
| * | | | | refactoring after latest feedbackMarkus Doits2018-11-071-1/+15
| | | | | |
| * | | | | remove now unneeded validationMarkus Doits2018-11-071-1/+0
| | | | | |
| * | | | | fix wrong retry error messagesMarkus Doits2018-11-071-0/+12
| | | | | |
| * | | | | refactor validations to a Entry::Retry classMarkus Doits2018-11-073-64/+78
| | | | | |
| * | | | | one more try to reduce cognitive overheadMarkus Doits2018-11-071-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: - Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_when` has a Cognitive Complexity of 6 (exceeds 5 allowed). Consider refactoring.
| * | | | | refactor for hopefully lower cognitive complexityMarkus Doits2018-11-071-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before: - Method `validate_retry` has a Cognitive Complexity of 7 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring. - Method `validate_retry_when` has a Cognitive Complexity of 14 (exceeds 5 allowed). Consider refactoring.
| * | | | | fix allowed keys validator to use correct attribute as error base?Markus Doits2018-11-071-2/+2
| | | | | |
| * | | | | update job config validator to validate new retry syntaxMarkus Doits2018-11-072-6/+61
| | | | | |
* | | | | | Merge branch 'triggermesh-phase1-knative' into 'master'Grzegorz Bizon2018-11-072-4/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to install Knative as cluster application See merge request gitlab-org/gitlab-ce!22593
| * | | | | | Fix double-negationChris Baumbauer2018-11-061-2/+2
| | | | | | |
| * | | | | | Refactor preinstall/postinstall methods in the helm installerChris Baumbauer2018-11-061-6/+2
| | | | | | |
| * | | | | | Fix issue with missing knative cluster role binding, and cleanup testsChris Baumbauer2018-11-051-8/+16
| | | | | | |
| * | | | | | Resolve issues raised by KamilChris Baumbauer2018-11-031-16/+3
| | | | | | |
| * | | | | | Merge branch 'master' into triggermesh-phase1-knativeChris Baumbauer2018-11-037-24/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into triggermesh-phase1-knativeChris Baumbauer2018-11-02158-274/+1027
| |\ \ \ \ \ \ \
| * | | | | | | | Remove comments from migration script and add usage dataChris Baumbauer2018-11-011-0/+1
| | | | | | | | |
| * | | | | | | | Revert Helm version bumpChris Baumbauer2018-10-293-5/+21
| | | | | | | | |
| * | | | | | | | Knative supportChris Baumbauer2018-10-241-0/+1
| | | | | | | | |
| * | | | | | | | Update helm version 1.7.2 -> 2.11.0Chris Baumbauer2018-10-243-5/+22
| | | | | | | | |
* | | | | | | | | Merge branch 'dm-api-merge-requests-index-merged-at' into 'master'Sean McGivern2018-11-073-18/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose {closed,merged}_{at,by} in merge requests API index Closes #52031 See merge request gitlab-org/gitlab-ce!22806
| * | | | | | | | | Expose {closed,merged}_{at,by} in merge requests API indexDouwe Maan2018-11-053-18/+18
| | | | | | | | | |
* | | | | | | | | | Merge branch '43521-keep-personal-emails-private' into 'master'Douwe Maan2018-11-071-0/+28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds option to override commit email Closes #43521 See merge request gitlab-org/gitlab-ce!22560
| * | | | | | | | | | User can keep their commit email private43521-keep-personal-emails-privateTiago Botelho2018-11-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The private commit email is automatically generated in the format: id-username@noreply.HOSTNAME GitLab instance admins are able to change the HOSTNAME portion, that defaults to Gitlab's hostname, to whatever they prefer.
* | | | | | | | | | | Merge branch 'touchup-ci-normalizer' into 'master'Grzegorz Bizon2018-11-071-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Touchup Normalizer implementation See merge request gitlab-org/gitlab-ce!22872
| * | | | | | | | | | | Move extracting job names outside the looptouchup-ci-normalizerMatija Čupić2018-11-071-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Return untouched hash if no job is parallelizedMatija Čupić2018-11-071-2/+4
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'refactor-snippets-finder' into 'master'Douwe Maan2018-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite SnippetsFinder to improve performance Closes #52639 See merge request gitlab-org/gitlab-ce!22606
| * | | | | | | | | | Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finderDouwe Maan2018-11-0661-176/+265
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/models/project_spec.rb