summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use global feature flag for fast destroyfast-destroy-global-flagJan Provaznik2018-12-131-1/+1
| | | | | | | | Rolling out fast destroy feature is not ideal if this feature is scoped to a specific project/group because uploads are typically scoped to project or group, so we would have to enable this feature for a project which is going to be destroyed (which we don't know in front).
* Merge branch 'nurtch' into 'master'54259-uploads-docs-gives-incorrect-configuration-optionsMike Lewis2018-12-121-1/+1
|\ | | | | | | | | Nurtch link See merge request gitlab-org/gitlab-ce!23668
| * changed 'at our [doc]' to 'in our [doc]'Mike Lewis2018-12-121-1/+1
| |
| * Meaningful anchor textMarcia Ramos2018-12-121-1/+1
| | | | | | | | | | | | Ref https://docs.gitlab.com/ee/development/documentation/styleguide.html#lin ks
| * Replace full URL with relative pathMarcia Ramos2018-12-121-1/+1
| |
| * Nurtch linkSid Sijbrandij2018-12-071-1/+1
| |
* | Merge branch 'winh-padding-classes' into 'master'Annabel Dunstone Gray2018-12-121-0/+14
|\ \ | | | | | | | | | | | | Add CSS helper classes for left and right padding See merge request gitlab-org/gitlab-ce!23760
| * | Add CSS helper classes for left and right paddingWinnie Hellmann2018-12-121-0/+14
| | |
* | | Merge branch 'update-testing-documentation' into 'master'Stan Hu2018-12-121-0/+10
|\ \ \ | | | | | | | | | | | | | | | | Document how to run rspec tests See merge request gitlab-org/gitlab-ce!23780
| * | | Update best_practices.mdSam Bigelow2018-12-121-3/+3
| | | |
| * | | Document how to run rspec testsSam Bigelow2018-12-121-0/+10
|/ / /
* | | Merge branch 'database-deprecation-warnings' into 'master'Robert Speicher2018-12-1224-46/+46
|\ \ \ | | | | | | | | | | | | | | | | Resolve various database deprecation warnings See merge request gitlab-org/gitlab-ce!23772
| * | | Fix deprecations in opclasses initializerYorick Peterse2018-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The use of `table_exists?` in the opclasses support initializer triggers a deprecation warning. Using `data_source_exists?` removes this deprecation.
| * | | Fix ActiveRecord::Migration deprecationsYorick Peterse2018-12-1223-45/+45
| | | | | | | | | | | | | | | | | | | | Extending from ActiveRecord::Migration is deprecated, but was still used in a bunch of places.
* | | | Merge branch 'refactor-create-or-update-import-data' into 'master'Robert Speicher2018-12-123-8/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor Project#create_or_update_import_data See merge request gitlab-org/gitlab-ce!23701
| * | | | Refactor Project#create_or_update_import_dataYorick Peterse2018-12-113-8/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/release/framework/issues/28 we found that this method was changed a lot over the years: 43 times if our calculations were correct. Looking at the method, it had quite a few branches going on: def create_or_update_import_data(data: nil, credentials: nil) return if data.nil? && credentials.nil? project_import_data = import_data || build_import_data if data project_import_data.data ||= {} project_import_data.data = project_import_data.data.merge(data) end if credentials project_import_data.credentials ||= {} project_import_data.credentials = project_import_data.credentials.merge(credentials) end project_import_data end If we turn the || and ||= operators into regular if statements, we can see a bit more clearly that this method has quite a lot of branches in it: def create_or_update_import_data(data: nil, credentials: nil) if data.nil? && credentials.nil? return else project_import_data = if import_data import_data else build_import_data end if data if project_import_data.data # nothing else project_import_data.data = {} end project_import_data.data = project_import_data.data.merge(data) end if credentials if project_import_data.credentials # nothing else project_import_data.credentials = {} end project_import_data.credentials = project_import_data.credentials.merge(credentials) end project_import_data end end The number of if statements and branches here makes it easy to make mistakes. To resolve this, we refactor this code in such a way that we can get rid of all but the first `if data.nil? && credentials.nil?` statement. We can do this by simply sending `to_h` to `nil` in the right places, which removes the need for statements such as `if data`. Since this data gets written to a database, in ProjectImportData we do make sure to not write empty Hash values. This requires an `unless` (which is really a `if !`), but the resulting code is still very easy to read.
* | | | | Merge branch 'issue_55024' into 'master'Nick Thomas2018-12-124-0/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not save user preferences on read-only mode Closes #55024 See merge request gitlab-org/gitlab-ce!23698
| * | | | | Do not save user preferences on read-only modeFelipe Artur2018-12-124-0/+38
|/ / / / /
* | | | | Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffsSid Sijbrandij2018-12-121-0/+1
| | | | |
* | | | | Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffsSid Sijbrandij2018-12-121-0/+1
| |/ / / |/| | |
* | | | Merge branch 'feature/gb/ci-pipeline-bridge' into 'master'Kamil Trzciński2018-12-125-0/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add basic implementation of CI/CD bridge job See merge request gitlab-org/gitlab-ce!23730
| * | | | Simplify CI/CD bridge classGrzegorz Bizon2018-12-121-8/+1
| | | | |
| * | | | Add basic implementation of CI/CD bridge jobGrzegorz Bizon2018-12-125-0/+125
| | | | |
* | | | | Merge branch 'qa-mr-wait-for-push' into 'master'Nick Thomas2018-12-121-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Wait for push before trying to create a new MR See merge request gitlab-org/gitlab-ce!23745
| * | | | | Wait for push before trying to create a new MRMark Lapierre2018-12-111-1/+4
| | | | | |
* | | | | | Merge branch 'zj-fix-pool-creation' into 'master'Nick Thomas2018-12-122-3/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix creation query for pools repository See merge request gitlab-org/gitlab-ce!23729
| * | | | | | Fix creation query for pools repositoryZeger-Jan van de Weg2018-12-122-3/+26
|/ / / / / /
* | | | | | Merge branch ↵Nick Thomas2018-12-1217-21/+240
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54650-send-an-email-to-project-owners-when-a-mirror-update-fails' into 'master' Send a notification email on mirror update errors Closes #54650 See merge request gitlab-org/gitlab-ce!23595
| * | | | | | Send a notification email on mirror update errorsAlejandro Rodríguez2018-12-1117-21/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The email is sent to project maintainers containing the last mirror update error. This will allow maintainers to set alarms and react accordingly.
* | | | | | | Merge branch 'docs/update-automatic-merge-documentation' into 'master'Marcia Ramos2018-12-121-83/+177
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update automatic merging documentation See merge request gitlab-org/gitlab-ce!23689
| * | | | | | | Update automatic merging documentationYorick Peterse2018-12-111-83/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're moving from merging + reverting to only merging with the `ours` strategy, removing the need for merge requests or reverting conflicts. For more details, refer to Merge Train merge request https://gitlab.com/gitlab-org/merge-train/merge_requests/6.
* | | | | | | | Merge branch 'lock-sass-3.5' into 'master'Stan Hu2018-12-123-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify sass ~> 3.5 in Gemfile See merge request gitlab-org/gitlab-ce!23716
| * | | | | | | | Specify sass ~> 3.5 in GemfilePirate Praveen2018-12-123-0/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-35' into 'master'Marcia Ramos2018-12-121-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add spaces before code snippets in vuex.md See merge request gitlab-org/gitlab-ce!23737
| * | | | | | | | | Add spaces before code snippetsSylhare2018-12-111-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'issue_55133' into 'master'Sean McGivern2018-12-122-2/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issuables sort direction button parameters Closes #55133 See merge request gitlab-org/gitlab-ce!23744
| * | | | | | | | | Fix issuables sort direction button parametersFelipe Artur2018-12-112-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels parameter being deleted from filter when clicking sort direction button on issues/merge requests search bar.
* | | | | | | | | | Merge branch 'patch-35' into 'master'Achilleas Pipinellis2018-12-121-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: Content corrections for reCAPTCHA docs See merge request gitlab-org/gitlab-ce!23667
| * | | | | | | | | | Update recaptcha docs for clarityJames Anderson2018-12-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Specified that reCAPTCHA v2 keys must be used * Updated the URL for application settings * Some small rewording
* | | | | | | | | | | Merge branch 'docs-add-fork-mr-clarification' into 'master'Achilleas Pipinellis2018-12-121-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add information about how merge requests related to forks are processed See merge request gitlab-org/gitlab-ce!23764
| * | | | | | | | | | | add information about how merge requests related to forks are processedAlexander Tanayno2018-12-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the added note describes code from https://gitlab.com/gitlab-org/gitlab-ee/blob/master/lib/gitlab/import_export/merge_request_parser.rb#L15
* | | | | | | | | | | | Merge branch 'tatkins-installation-method-docs' into 'master'Achilleas Pipinellis2018-12-124-67/+93
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs to help choose the best GitLab installation method Closes #54308 See merge request gitlab-org/gitlab-ce!23254
| * | | | | | | | | | | | 'of installing' -> 'for installing'Mike Lewis2018-12-071-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Clarify the installation methodsAchilleas Pipinellis2018-12-061-34/+40
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Achilleas Pipinellis2018-12-05482-3276/+10044
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tatkins-installation-method-docs
| * | | | | | | | | | | | | Make k8s trade-offs less intimidatingAchilleas Pipinellis2018-12-041-5/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Reword note about familiarity with k8sAchilleas Pipinellis2018-12-034-48/+39
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove mention of deprecated charts in the docsAchilleas Pipinellis2018-12-031-23/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Refactor the GitLab k8s installation methodAchilleas Pipinellis2018-11-293-60/+68
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into tatkins-installation-method-docsAchilleas Pipinellis2018-11-292541-24140/+117376
| |\ \ \ \ \ \ \ \ \ \ \ \ \