summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Update used version of Runner Helm Chart to 0.1.38Tomasz Maczukin2018-11-221-1/+1
|
* Eliminate duplicated wordsTakuya Noguchi2018-11-222-2/+2
| | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Merge branch '49565-ssh-push-mirroring' into 'master'Robert Speicher2018-11-202-8/+128
|\ | | | | | | | | | | | | SSH public-key authentication for push mirroring Closes #49565 See merge request gitlab-org/gitlab-ce!22982
| * SSH public-key authentication for push mirroringNick Thomas2018-11-192-8/+128
| |
* | Merge branch '3062-improve-project-cache' into 'master'Douwe Maan2018-11-201-2/+10
|\ \ | | | | | | | | | | | | | | | | | | Change project cache key to depend on ID instead of full path Closes #42191 See merge request gitlab-org/gitlab-ce!23135
| * | Add `wiki` extra namespace when repository is_wiki: true3062-improve-project-cacheGabriel Mazetto2018-11-161-2/+10
| | |
* | | Merge branch 'rails5-active-record-class-value' into 'master'Stan Hu2018-11-192-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Rails5 deprecation: Passing a class as a value in an Active Record query is deprecated See merge request gitlab-org/gitlab-ce!23164
| * | | Rails5: Passing a class as a value in an Active Record query is deprecatedJasper Maes2018-11-172-3/+3
| | |/ | |/|
* | | Merge branch '54046-fix-by-any-email-for-private-commit-emails' into 'master'Douwe Maan2018-11-192-34/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Match users better by their private commit email Closes #54046 See merge request gitlab-org/gitlab-ce!23080
| * | | Match users better by their private commit emailNick Thomas2018-11-192-34/+40
| | | | | | | | | | | | | | | | | | | | | | | | Private commit emails were introduced in !22560, but some parts of GitLab were not updated to take account of them. This commit adds support in places that were missed.
* | | | Merge branch 'improve-variables-support' into 'master'Sean McGivern2018-11-192-27/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve variables support See merge request gitlab-org/gitlab-ce!23077
| * | | | Improve variables supportimprove-variables-supportKamil Trzciński2018-11-192-27/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that variables accept only string, alongside also improves kubernetes_namespace, improving validation and default value being set.
* | | | | Add support for surfacing a link to the branch or tag name in push message…Tony Castrogiovanni2018-11-191-28/+19
| |/ / / |/| | |
* | | | Merge branch 'refactor-member-add-user-for-ee' into 'master'Robert Speicher2018-11-191-5/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Refactor Member#add_user for GitLab EE See merge request gitlab-org/gitlab-ce!23119
| * | | Refactor Member#add_user for GitLab EErefactor-member-add-user-for-eeYorick Peterse2018-11-151-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab EE extends Member#add_user by adding some LDAP specific flags. Prior to these changes, the only way this could be done was by modifying Member#add_user in place. This could lead to merge conflicts whenever a developer wants to change this method. To resolve this issue, the logic that EE extends has been moved into a separate method with the appropriate arguments. This allows EE to extend the logic by prepending the method using an EE specific module.
* | | | Merge branch '53700-hashed-storagemigration' into 'master'Stan Hu2018-11-161-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Hashed Storage: allow migration to be retried in partially migrated projects Closes #53700 See merge request gitlab-org/gitlab-ce!23087
| * | | Allow partially migrated repositories to continue migration53700-hashed-storagemigrationGabriel Mazetto2018-11-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Previously we verified if the projecthave at least migrated their repository to hashed storage and prevented the migration command to start a new migration. The new version checks for the latest storage version available (fully migrated), otherwise it allows migration to be triggered again.
* | | Merge branch 'refactor-enums-for-ee' into 'master'Robert Speicher2018-11-166-30/+76
|\ \ \ | | | | | | | | | | | | | | | | Refactor how a few ActiveRecord enums are defined See merge request gitlab-org/gitlab-ce!23024
| * | | Refactor how a few ActiveRecord enums are definedrefactor-enums-for-eeYorick Peterse2018-11-156-30/+76
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a few models we define ActiveRecord enums that are redefined in EE using the following pattern: enum :some_enum, { ... }.merge(EE_ENUM_VALUES) This particular approach is problematic to deal with, because it requires that we `prepend` and EE module _before_ defining the enum. This typically translates to the `prepend` being the first line in the model in EE, but this can easily lead to merge conflicts when developers add more `include` and/or `prepend` lines. As part of https://gitlab.com/gitlab-org/gitlab-ee/issues/8244 and https://gitlab.com/gitlab-org/gitlab-ee/issues/8241 we are moving `prepend` to the last line in a file, reducing the chances of running into merge conflicts. This poses a bit of a problem with the pattern above, because this pattern does not allow us to move the `prepend` further down a file. To resolve this problem, we simply move the Hash value of the enum to a separate class method. This method is defined in a separate module where necessary, allowing us to use it like so: enum :failure_reasons, ::SomeModelEnums.failure_reasons The method in turn is defined in a very straightforward manner: module SomeModelEnums def self.failure_reasons { ... } end end This makes it easy for EE to add values without requiring the `prepend` to be placed before the `enum` is defined. For more information, see the following issues and merge requests: * https://gitlab.com/gitlab-org/gitlab-ee/issues/8244 * https://gitlab.com/gitlab-org/gitlab-ee/issues/8241 * https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8424
* | | Merge branch '49726-upgrade-helm-to-2-11' into 'master'Kamil Trzciński2018-11-161-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade Helm Tiller Version Used By GitLab Managed Apps" Closes #49726 See merge request gitlab-org/gitlab-ce!22693
| * | | Extract Helm::ClientCommand for shared commandsDylan Griffith2018-11-161-0/+3
| | | |
| * | | Upgrade helm to 2.11.0 and upgrade on every installDylan Griffith2018-11-161-0/+4
| | | |
* | | | Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'Grzegorz Bizon2018-11-161-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Can merge branch before build is started" Closes #28682 See merge request gitlab-org/gitlab-ce!22911
| * | | | Strictly require a pipeline to mergeMatija Čupić2018-11-081-1/+0
| | | | |
* | | | | Merge branch 'backport-service-hook-execute-arguments' into 'master'Robert Speicher2018-11-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport ServiceHook#execute from EE See merge request gitlab-org/gitlab-ce!23122
| * | | | | Backport ServiceHook#execute from EEbackport-service-hook-execute-argumentsYorick Peterse2018-11-151-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EE this method takes an additional argument that specifies the name of the hook to trigger. There is no particular reason to not backport this to CE, since by default the behaviour remains the same. By backporting this code we remove the need for prepending ServiceHook with a module in EE.
* | | | | Remove unused project methodGeorge Tsiolis2018-11-151-4/+0
|/ / / /
* | | | Add knative client to kubeclient libraryChris Baumbauer2018-11-151-0/+4
| |_|/ |/| |
* | | Ignore environment validation failureShinya Maeda2018-11-151-0/+4
| | |
* | | Add ApplicationRecord model classJan Provaznik2018-11-141-0/+5
| | | | | | | | | | | | In Rails 5 all models by default inherit from ApplicationRecord.
* | | Avoid returning deployment metrics url to MR widget when the deployment is ↵Shinya Maeda2018-11-141-3/+3
| | | | | | | | | | | | not successful
* | | Fix a race condition intermittently breaking GitLab startupNick Thomas2018-11-131-6/+5
| | |
* | | Merge branch 'refactor-reference-regexes-and-identity-scopes' into 'master'Robert Speicher2018-11-135-17/+30
|\ \ \ | | | | | | | | | | | | | | | | Refactor reference regexes and identity scopes See merge request gitlab-org/gitlab-ce!22987
| * | | Move Identity.uniqueness_scope to a modulerefactor-reference-regexes-and-identity-scopesYorick Peterse2018-11-122-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | Moving this method to a separate module looks a bit odd, but it allows for EE to extend the method without also having to redefine a variety of validation rules.
| * | | Turn reference regex constants into methodsYorick Peterse2018-11-123-11/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Mentionable::ReferenceRegexes` used to define the following two constants: 1. DEFAULT_PATTERN 2. EXTERNAL_PATTERN These two constants were built using some of the class methods that reside in this same module. In EE we redefine one of these methods by using `prepend` at the start of the `ReferenceRegexes` module. This poses a problem: we can not move the `prepend` to the end of the file, because the constants later on depend on it. To resolve this problem, this commit turns these constants into class methods that memoize their results. This allows EE to redefine the appropriate methods before these two class methods are used, in turn allowing us to move the `prepend` to the end of the file. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8198 for more information.
* | | Show HTTP response code for Kubernetes errorsThong Kuah2018-11-132-6/+2
| | |
* | | Fix deployment jobs using nil tokenThong Kuah2018-11-132-1/+3
| | |
* | | Merge branch 'fix-tags-for-envs' into 'master'Stan Hu2018-11-121-5/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix tags for environments Closes gitlab-ee#8397 See merge request gitlab-org/gitlab-ce!22993
| * | | Fix non-hacking wayKamil Trzciński2018-11-121-2/+1
| | | |
| * | | Do not reload self on hooks when creating deploymentfix-tags-for-envsKamil Trzciński2018-11-121-3/+1
| | |/ | |/|
* | | Merge branch 'sh-53180-append-path' into 'master'Rémy Coutable2018-11-125-29/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make sure there's only one slash as path separator Closes #53180 See merge request gitlab-org/gitlab-ce!22954
| * | | Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-095-29/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fix MergeRequestService erroring out on deleted branchStan Hu2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a branch is deleted, the push commit IDs is an empty array. The previous change would attempt to call `[].exists?`, which is invalid. Fix this by returning `MergeRequestDiffCommit.none` instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53853
* | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-121-17/+28
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-091-17/+28
| | |/ | |/|
* | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-123-0/+59
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
| * | Fix minor offensesblackst0ne-add-discord-serviceblackst0ne2018-11-101-5/+1
| | |
| * | DRY specs, fix typos in docsblackst0ne2018-11-061-1/+1
| | |
| * | Update discord notification serviceblackst0ne2018-11-051-6/+4
| | |
| * | Add Discord integrationblackst0ne2018-10-303-0/+65
| | |