- 15 Nov, 2018 26 commits
-
-
Yorick Peterse authored
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
-
Phil Hughes authored
Prevents empty button in jobs empty state Closes #54021 See merge request gitlab-org/gitlab-ce!23072
-
Nick Thomas authored
Remove display of local Sidekiq process in /admin/sidekiq Closes #46133 See merge request gitlab-org/gitlab-ce!23118
-
Kamil Trzciński authored
Use the new parallel keyword in .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!23083
-
Stan Hu authored
In a cloud-native or high-availability configuration, Sidekiq may not be running on the same node as the Web worker. The output of the `ps` output does not work in this case and can mislead admins that Sidekiq isn't running. Remove it in favor of the Sidekiq dashboard, which shows local processes using the Redis information. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46133
-
Phil Hughes authored
Fix types comment See merge request gitlab-org/gitlab-ce!23107
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Kamil Trzciński authored
Update config map if already present on install Closes #53626 See merge request gitlab-org/gitlab-ce!22969
-
Robert Speicher authored
Remove Gemfile.rails5 See merge request gitlab-org/gitlab-ce!23109
-
Kamil Trzciński authored
Add knative client to kubeclient library See merge request gitlab-org/gitlab-ce!22968
-
Chris Baumbauer authored
-
Kamil Trzciński authored
Ignore environment validation failure See merge request gitlab-org/gitlab-ce!23100
-
Shinya Maeda authored
-
Jan Provaznik authored
This file is not needed anymore (since we switched to rails 5 already).
-
Douwe Maan authored
Remove 'comment_on_any_diff_line' feature flag Closes #54034 See merge request gitlab-org/gitlab-ce!23093
-
yukihir0 authored
-
Thong Kuah authored
When an application install fails, and the user retries install, the configmap for the application will already exists. If so, we simply update instead of create.
-
Grzegorz Bizon authored
Avoid Gitaly RPC errors when fetching diff stats Closes gitaly#1393 See merge request gitlab-org/gitlab-ce!22995
-
Grzegorz Bizon authored
Switch kubernetes:active with checking $KUBECONFIG Closes gitlab-ee#8311 See merge request gitlab-org/gitlab-ce!22929
-
Sean McGivern authored
Don't care about order when getting awarded issues Closes #53491 See merge request gitlab-org/gitlab-ce!23101
-
Toon Claes authored
Fixing failing master: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/116776474
-
Sean McGivern authored
Fix a typo in Admin: intergration -> integration See merge request gitlab-org/gitlab-ce!23050
-
Sean McGivern authored
Add documentation on how to use structured logging Closes #54059 See merge request gitlab-org/gitlab-ce!23031
-
Achilleas Pipinellis authored
Shortcuts documentation: Add the PC equivalent of the Mac's "Cmd" key in the WebIDE section See merge request gitlab-org/gitlab-ce!23064
-
Stan Hu authored
Update to new security report syntax See merge request gitlab-org/gitlab-ce!23094
-
Filipa Lacerda authored
Made diff & note data consistent See merge request gitlab-org/gitlab-ce!22950
-
- 14 Nov, 2018 14 commits
-
-
Fatih Acet authored
Fix version system note Closes #53882 See merge request gitlab-org/gitlab-ce!23030
-
Lukas Eipert authored
-
Douglas Barbosa Alexandre authored
Exclude qa and docs from Rails 4 builds Closes #54059 See merge request gitlab-org/gitlab-ce!23091
-
Stan Hu authored
-
Oswaldo Ferreira authored
-
Stan Hu authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
-
Stan Hu authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
-
Stan Hu authored
-
Annabel Dunstone Gray authored
-
Stan Hu authored
Fix bug causing not all emails to show up in commit email selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Fatih Acet authored
Fix styling of snippet and commit discussion comments Closes #53918 See merge request gitlab-org/gitlab-ce!23035
-