summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'git-protocol-v2-docs' into 'master'"yorick-revert-test-temporaryYorick Peterse2018-11-161-9/+1
| | | This reverts merge request !23138
* Merge branch 'git-protocol-v2-docs' into 'master'yorick-revert-test-masterAchilleas Pipinellis2018-11-161-1/+9
|\ | | | | | | | | Add information on support for git v2 in docs See merge request gitlab-org/gitlab-ce!23138
| * Add information on support for git v2 in docsBalasankar "Balu" C2018-11-161-1/+9
|/
* Merge branch 'lm-update-architecture-docs' into 'master'Achilleas Pipinellis2018-11-161-23/+166
|\ | | | | | | | | Update architecture.md to have a component by component overview See merge request gitlab-org/gitlab-ce!22472
| * Update architecture.md to have a component by component overviewLee Matos2018-11-161-23/+166
|/
* Merge branch 'docs/fix_changelog_type_documentation' into 'master'Achilleas Pipinellis2018-11-161-9/+9
|\ | | | | | | | | Add missing `performance` to changelog type doc See merge request gitlab-org/gitlab-ce!22733
| * Add missing `performance` to changelog type docdocs/fix_changelog_type_documentationPhilippe Lafoucrière2018-11-011-9/+9
| |
* | Merge branch 'validate-that-foreign-keys-are-created' into 'master'Sean McGivern2018-11-165-6/+189
|\ \ | | | | | | | | | | | | | | | | | | Validate that foreign keys are indexed and created Closes #50875 See merge request gitlab-org/gitlab-ce!22808
| * | Add missing cluster_id on knativevalidate-that-foreign-keys-are-createdKamil Trzciński2018-11-152-0/+3
| | |
| * | Update CHANGELOGKamil Trzciński2018-11-152-7/+2
| | |
| * | Remove indexes for FKKamil Trzciński2018-11-151-1/+26
| | |
| * | Backport EE changesKamil Trzciński2018-11-151-1/+7
| | |
| * | Validate foreign keys being indexedKamil Trzciński2018-11-156-6/+160
| | |
| * | Merge remote-tracking branch 'origin/remove-rails5-gemfile'Kamil Trzciński2018-11-151-7/+0
| |\ \
* | \ \ Merge branch '41875-allow-pipelines-to-be-deleted-by-project-owners' into ↵Grzegorz Bizon2018-11-168-0/+193
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Allow pipelines to be deleted by project owners" Closes #41875 See merge request gitlab-org/gitlab-ce!22988
| * | | | Add spec for Pipeline DELETE for developers41875-allow-pipelines-to-be-deleted-by-project-ownersMatija Čupić2018-11-131-4/+21
| | | | |
| * | | | Raise exception when user is not authorizedMatija Čupić2018-11-132-9/+3
| | | | |
| * | | | Authorize DestroyPipelineService against pipelineMatija Čupić2018-11-135-4/+25
| | | | |
| * | | | Move pipeline delete docs to endMatija Čupić2018-11-131-17/+17
| | | | |
| * | | | Add docs for deleting a pipeline via APIMatija Čupić2018-11-121-0/+17
| | | | |
| * | | | Add CHANGELOG entryMatija Čupić2018-11-121-0/+5
| | | | |
| * | | | Destroy pipeline in serviceMatija Čupić2018-11-125-16/+93
| | | | | | | | | | | | | | | | | | | | | | | | | Move all logic for destroying a Pipeline into a service so it's easily reusable.
| * | | | Implement MVC for Pipeline deletion APIMatija Čupić2018-11-122-0/+62
| | | | |
* | | | | Merge branch 'gt-rename-diffs-store-variable' into 'master'Phil Hughes2018-11-165-9/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename diffs store variable See merge request gitlab-org/gitlab-ce!23123
| * | | | | Rename diffs store variableGeorge Tsiolis2018-11-155-9/+14
| | | | | |
* | | | | | Merge branch 'gt-replace-weight-icon-ce' into 'master'Kushal Pandya2018-11-161-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace weight icon See merge request gitlab-org/gitlab-ce!23144
| * | | | | | Replace weight iconGeorge Tsiolis2018-11-161-0/+4
| | | | | | |
* | | | | | | Merge branch 'refactor-enums-for-ee' into 'master'Robert Speicher2018-11-167-34/+82
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-157-34/+82
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'image-discussion-ff-fix' into 'master'Filipa Lacerda2018-11-163-13/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed image discussion styling Closes #54110 See merge request gitlab-org/gitlab-ce!23127
| * | | | | | Fixed image discussion stylingPhil Hughes2018-11-163-13/+10
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the styling of image discussions after the discussion styling changes. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54110
* | | | | | Merge branch 'jramsay/object-storage-docs' into 'master'Marcia Ramos2018-11-161-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object storage docs are not relevant to GitLab.com and is in Core See merge request gitlab-org/gitlab-ce!22943
| * | | | | | Fix object storage tier informationjramsay/object-storage-docsJames Ramsay2018-11-151-2/+5
| | | | | | |
* | | | | | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-11-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix punctuation error See merge request gitlab-org/gitlab-ce!22345
| * | | | | | | Fix punctuation errorAndrew Banchich2018-10-141-1/+1
| | | | | | | |
* | | | | | | | Merge branch '49726-upgrade-helm-to-2-11' into 'master'Kamil Trzciński2018-11-1612-31/+102
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrade Helm Tiller Version Used By GitLab Managed Apps" Closes #49726 See merge request gitlab-org/gitlab-ce!22693
| * | | | | | | | Remove unnecessary --tiller-namespace49726-upgrade-helm-to-2-11Dylan Griffith2018-11-163-12/+12
| | | | | | | | |
| * | | | | | | | Use helm version loop instead of sleep in ClientCommandDylan Griffith2018-11-163-12/+12
| | | | | | | | |
| * | | | | | | | Extract Helm::ClientCommand for shared commandsDylan Griffith2018-11-164-32/+33
| | | | | | | | |
| * | | | | | | | Upgrade helm to 2.11.0 and upgrade on every installDylan Griffith2018-11-1611-17/+87
| | | | | | | | |
* | | | | | | | | Merge branch ↵Steve Azzopardi2018-11-162-4/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54011-all-files-named-index-have-their-content-rendered-as-if-they-were-text-files' into 'master' Resolve "All files named `index.*` have their content rendered as if they were text files" Closes #54011 See merge request gitlab-org/gitlab-ce!23063
| * | | | | | | | | Fix rubocop warning54011-all-files-named-index-have-their-content-rendered-as-if-they-were-text-filesJames Lopez2018-11-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Remove redundant end anchorsJames Lopez2018-11-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Update regex to use unionJames Lopez2018-11-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix spec failureJames Lopez2018-11-151-1/+2
| | | | | | | | | |
| * | | | | | | | | Fix trailing whitespaceJames Lopez2018-11-151-1/+1
| | | | | | | | | |
| * | | | | | | | | Update spec to use PLAIN_FILENAMES constantJames Lopez2018-11-151-1/+2
| | | | | | | | | |
| * | | | | | | | | Refactor spec to test all extensionsJames Lopez2018-11-151-1/+3
| | | | | | | | | |
| * | | | | | | | | Fix text rendering of readme/indexJames Lopez2018-11-142-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'sh-use-nokogiri-xml-backend' into 'master'Kamil Trzciński2018-11-164-1/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Nokogiri as the ActiveSupport XML backend Closes #54068 See merge request gitlab-org/gitlab-ce!23136