Commit graph

10 commits

Author SHA1 Message Date
GitLab Bot
120f4aaedc Add latest changes from gitlab-org/gitlab@master 2020-03-24 15:08:44 +00:00
GitLab Bot
c2367afbf5 Add latest changes from gitlab-org/gitlab@master 2020-02-24 18:09:05 +00:00
GitLab Bot
eb10f226b8 Add latest changes from gitlab-org/gitlab@master 2019-12-03 03:06:35 +00:00
GitLab Bot
80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
GitLab Bot
b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Kushal Pandya
df905b4080 Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' into 'master'"
This reverts merge request !30808
2019-08-14 17:53:07 +00:00
Dennis Tang
e5dd249c4f Add notification for updated privacy policy
This adds a notification to let users know of our updated privacy
policy.

Users can dismiss the notification either by following the link or
closing the notification via an "x" icon.
2019-08-14 12:20:36 +00:00
Nick Thomas
4f81737940
Renumber a new UserCallout enum for EE compatibility 2019-06-14 18:29:25 +01:00
Phil Hughes
d2fd6bd510
Added diff suggestion popover
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
2019-06-14 14:01:24 +01:00
Yorick Peterse
590ff80f83
Refactor how a few ActiveRecord enums are defined
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
2018-11-15 17:41:54 +01:00