summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-delete-tags-outside-transaction' into 'master'Robert Speicher2018-09-191-2/+0
|\ | | | | | | | | | | | | Delete container repository tags outside of transaction Closes #51380 See merge request gitlab-org/gitlab-ce!21679
| * Move registry destroy out of project transactionStan Hu2018-09-191-2/+0
| |
* | Merge branch 'fix-rubocop-todo' into 'master'Douglas Barbosa Alexandre2018-09-194-5/+5
|\ \ | | | | | | | | | | | | Fix rubocop Style/ZeroLengthPredicate See merge request gitlab-org/gitlab-ce!21793
| * | Fix rubocop Style/ZeroLengthPredicateSemyon Pupkov2018-09-184-5/+5
| | |
* | | Use standalone diff stats RPC on every comparison viewOswaldo Ferreira2018-09-191-1/+1
| |/ |/|
* | Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher2018-09-184-13/+34
|\ \ | | | | | | | | | | | | Remove EE-specific lines from Plan concerns See merge request gitlab-org/gitlab-ce!21448
| * | Fix bad conflicts resolutionLin Jen-Shin2018-09-171-2/+2
| | |
| * | Remove EE-specific code from ProtectedRefAccessSean McGivern2018-09-171-7/+11
| | |
| * | Remove EE-specific code from MentionableSean McGivern2018-09-173-6/+23
| | |
| * | Remove EE-specific code from IssuableSean McGivern2018-09-171-2/+2
| | |
* | | Don't use MilestoneFinder for group milestonesDouglas Barbosa Alexandre2018-09-182-2/+9
| | | | | | | | | | | | | | | | | | This refactors the DashboardGroupMilestone model so that it no longer uses the MilestoneFinder, instead using methods defined on the Milestone model directly.
* | | Merge branch '51564-fix-commit-email-usage' into 'master'Douwe Maan2018-09-181-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Respect the user commit email in more places Closes #51564 See merge request gitlab-org/gitlab-ce!21773
| * | | Guard against regressions in commit email specsNick Thomas2018-09-181-3/+4
| | | |
| * | | Use commit email for wiki actionsNick Thomas2018-09-171-1/+1
| | | |
* | | | Merge branch ↵Douwe Maan2018-09-181-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master' Resolve "Open issues from archived project listed in group issue board" Closes #45754 See merge request gitlab-org/gitlab-ce!21721
| * | | Filter out archived projects from issue/mr countBrett Walker2018-09-171-2/+2
| | | | | | | | | | | | | | | | Pass the 'non_archived' flag to finder methods
* | | | Merge branch 'sh-fix-commit-email-migration' into 'master'Nick Thomas2018-09-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a default commit email if migration has not completed Closes #51530 See merge request gitlab-org/gitlab-ce!21790
| * | | | Return a default commit email if migration has not completedStan Hu2018-09-151-1/+1
| |/ / / | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51530
* | | | Merge branch 'select-from-union' into 'master'Robert Speicher2018-09-1714-53/+113
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Replace direct use of Gitlab::SQL::Union with a "from_union" method Closes #51307 See merge request gitlab-org/gitlab-ce!21672
| * | | Added FromUnion to easily select from a UNIONYorick Peterse2018-09-1714-53/+113
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the module `FromUnion`, which provides the class method `from_union`. This simplifies the process of selecting data from the result of a UNION, and reduces the likelihood of making mistakes. As a result, instead of this: union = Gitlab::SQL::Union.new([foo, bar]) Foo.from("(#{union.to_sql}) #{Foo.table_name}") We can now write this instead: Foo.from_union([foo, bar]) This commit also includes some changes to make this new setup work properly. For example, a bug in Rails 4 (https://github.com/rails/rails/issues/24193) would break the use of `from("sub-query-here").includes(:relation)` in certain cases. There was also a CI query which appeared to repeat a lot of conditions from an outer query on an inner query, which isn't necessary. Finally, we include a RuboCop cop to ensure developers use this new module, instead of using Gitlab::SQL::Union directly. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
* | | Merge branch '44596-double-title-merge-request-message' into 'master'Grzegorz Bizon2018-09-171-1/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix double title in merge request chat messages Closes #44586 See merge request gitlab-org/gitlab-ce!21670
| * | Add fix for EE merge messageKukovskii Vladimir2018-09-141-1/+6
| | |
| * | Fix double title in merge request chat messagesKukovskii Vladimir2018-09-111-1/+1
| | |
* | | Merge branch '50460-send-deployment-information-in-job-api' into 'master'Kamil Trzciński2018-09-171-0/+23
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Send deployment information in job API" Closes #50460 See merge request gitlab-org/gitlab-ce!21307
| * | Add deployment information in job APISteve Azzopardi2018-09-131-0/+23
| | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50460
* | | Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher2018-09-142-8/+6
|\ \ \ | | | | | | | | | | | | | | | | CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
| * | | Fix how we use EE::ProtectedRefAccessLin Jen-Shin2018-09-112-8/+6
| | |/ | |/| | | | | | | | | | | | | This is a mess... Using prepend will give a different ancestors chain we're not expecting. To fix this we'll need to know what exactly methods we want to use in each classes using this module.
* | | Cleaned up CI runner administration codeYorick Peterse2018-09-141-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19625 some changes were introduced that do not meet our abstraction reuse rules. This commit cleans up some of these changes so the requirements are met. Most notably, sorting of the runners in Admin::RunnersFinder has been delegated to Ci::Runner.order_by, similar to how we order data in models that include the Sortable module. If we need more sort orders in the future we can include Sortable and have Ci::Runner.order_by call `super` to delegate to Sortable.order_by.
* | | Resolve "Add functionality to change what email address online actions ↵Nick Thomas2018-09-141-1/+38
| | | | | | | | | | | | commit using"
* | | Merge branch 'revert-f87809f7' into 'master'Dmitriy Zaporozhets2018-09-141-9/+0
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'" See merge request gitlab-org/gitlab-ce!21722
| * | | Revert "Merge branch 'dz-add-project-id-to-jupyter' into 'master'"Dmitriy Zaporozhets2018-09-131-9/+0
| | |/ | |/| | | | This reverts merge request !21341
* | | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'Grzegorz Bizon2018-09-141-1/+10
|\ \ \ | | | | | | | | | | | | | | | | Feature: State filter for admin runners view See merge request gitlab-org/gitlab-ce!19625
| * | | add a comment to the usage of a anti-pattern queryAlexis Reigel2018-09-131-0/+6
| | | |
| * | | dry up available scopes to constantsAlexis Reigel2018-08-201-1/+3
| | | |
| * | | add offline scope to Ci::RunnerAlexis Reigel2018-08-201-0/+1
| | | |
* | | | Filter group milestones based on user membershipChantal Rollison2018-09-131-1/+1
| |/ / |/| |
* | | Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-1322-6/+122
|\ \ \ | | | | | | | | | | | | | | | | Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391
| * | | Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-1122-6/+122
| | |/ | |/| | | | | | | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* | | Merge branch ↵Grzegorz Bizon2018-09-133-13/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master' Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre" Closes #42861 See merge request gitlab-org/gitlab-ce!21603
| * | | Inline initialize_yaml_processorMatija Čupić2018-09-121-5/+1
| | | |
| * | | Address MR suggestionsMatija Čupić2018-09-072-5/+5
| | | | | | | | | | | | | | | | CE mirror of c4578b951e331fe8c75cd4f948ce74cec6587bad
| * | | Improve external architectureMatija Čupić2018-09-072-5/+9
| | | | | | | | | | | | | | | | CE mirror of 4f17c7b2c30188302e6a73421acbf5a09fb2c823
| * | | Make Repository#blob_data_at publicMatija Čupić2018-09-071-12/+8
| | | | | | | | | | | | | | | | CE mirror of 17de13ada1a98da060802c55889489a512183cd1
| * | | Change ExternalFile to retrieve local file from repository instead of GitLab ↵Matija Čupić2018-09-072-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | project CE mirror of 03c6094997023d9c8875ced421a6c9ef39a4af44
| * | | Import external files in Gitlab CI configMatija Čupić2018-09-071-1/+1
| | | | | | | | | | | | | | | | CE mirror of a10b777f8cb1902bba3964a4cbad2b1dd6bce785
* | | | Strip whitespace from Sentry URLStan Hu2018-09-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding extra whitespace in the DSN could prevent the server from starting due to InvalidURIErrors in sentry-raven. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49621
* | | | Merge branch 'clean-gitlab-git' into 'master'Douwe Maan2018-09-122-5/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Rugged and shell code from Gitlab::Git Closes gitaly#1124 See merge request gitlab-org/gitlab-ce!21488
| * | | | Remove Rugged and shell code from Gitlab::GitAlejandro Rodríguez2018-09-122-5/+0
| | | | |
* | | | | Add trigger information for job APISteve Azzopardi2018-09-122-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create new entity called TriggerVariablesEnitity for trigger variables, to aid reuseablity in the future. Update JSON schema to include trigger information in the response. Refactor rspec tests a bit to reduce duplication and for the `context` to make sense. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50989
* | | | | Merge branch 'dz-add-project-id-to-jupyter' into 'master'Dmitriy Zaporozhets2018-09-121-0/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add GitLab project id to jupyter config installed via cluster apps See merge request gitlab-org/gitlab-ce!21341
View Lorry Controller Status