- 15 Nov, 2018 12 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
-
Kamil Trzciński authored
[EE] Use the new parallel keyword in .gitlab-ci.yml See merge request gitlab-org/gitlab-ee!8454
-
Steve Azzopardi authored
CE upstream - 2018-11-15 06:21 UTC See merge request gitlab-org/gitlab-ee!8460
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Phil Hughes authored
-
Robert Speicher authored
Move EE prepend/include to the end of helpers See merge request gitlab-org/gitlab-ee!8422
-
Sean McGivern authored
Fix a typo in Admin: intergration -> integration See merge request gitlab-org/gitlab-ee!8444
-
GitLab Bot authored
-
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
-
🤖 GitLab Bot 🤖 authored
CE upstream - 2018-11-14 22:21 UTC Closes gitlab-ce#54059 See merge request gitlab-org/gitlab-ee!8458
-
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 28 commits
-
-
Fatih Acet authored
Fix version system note Closes #53882 See merge request gitlab-org/gitlab-ce!23030
-
Lukas Eipert authored
-
GitLab Bot authored
-
🤖 GitLab Bot 🤖 authored
CE upstream - 2018-11-14 21:21 UTC Closes gitlab-ce#54045 See merge request gitlab-org/gitlab-ee!8456
-
Douglas Barbosa Alexandre authored
Exclude qa and docs from Rails 4 builds Closes #54059 See merge request gitlab-org/gitlab-ce!23091
-
GitLab Bot authored
-
Stan Hu authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54059
-
🤖 GitLab Bot 🤖 authored
CE upstream - 2018-11-14 19:21 UTC Closes gitlab-org/quality/staging#16 See merge request gitlab-org/gitlab-ee!8453
-
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
-
GitLab Bot authored
-
Phil Hughes authored
This caused many pain points when working with it. Part of the data was camel cased the other snake case. Other parts where snake case & then getting converted in components, this conversion has the potential for leaking memory. This changes that & makes it consistent with what it returned from the API, snake case.
-
Douwe Maan authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54045
-
Fatih Acet authored
Fix vertical line alignment in discussion & diff border-radius Closes #53975 See merge request gitlab-org/gitlab-ce!23075
-
Fatih Acet authored
Add white background to commit diff comments See merge request gitlab-org/gitlab-ce!23078
-
🤖 GitLab Bot 🤖 authored
CE upstream - 2018-11-14 17:23 UTC Closes gitlab-ce#53866 See merge request gitlab-org/gitlab-ee!8451
-
Annabel Dunstone Gray authored
-
Rémy Coutable authored
Fix Git protocol v2 e2e test Closes gitlab-org/quality/staging#16 See merge request gitlab-org/gitlab-ce!23067
-
Rémy Coutable authored
Update proofreader.md See merge request gitlab-org/gitlab-ce!20752
-
GitLab Bot authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Clement Ho authored
Updates pipeline code to use gitlab-ui See merge request gitlab-org/gitlab-ce!22999
-
Annabel Dunstone Gray authored
-