Commit Graph

16 Commits

Author SHA1 Message Date
GitLab Bot eb10f226b8 Add latest changes from gitlab-org/gitlab@master 2019-12-03 03:06:35 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
dineshpanda 81d690ee1a Avoid calling freeze on already frozen strings in app/helpers 2019-09-04 09:37:15 +05:30
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
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
Luke Bennett af7eb13cfc
Prep backend for /billings gold trial callouts
Ports GoldTrialUserCallouts to CE.
2019-03-01 21:25:38 +00:00
Michael Kozono 0b36422f98 Port of mk/geo-deprecate-legacy-storage to CE 2019-01-04 15:14:15 -08:00
Mayra Cabrera fe083f505d Removes experimental label from cluster views
As part of https://gitlab.com/gitlab-org/gitlab-ce/issues/51716, we need
to remove 'experimental' labels from cluster views (show and form), as
well as the promp about cluster configuration, since it won't apply.

These changes were originally introduced on
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011/, but we're
trying to reduce the size of that MR as it's to big to review with
confidence.
2018-11-05 11:25:09 +01:00
gfyoung 1993a4449a Enable frozen string for app/helpers/**/*.rb
Partially addresses #47424.
2018-09-06 17:33:46 -07:00
Mike Greiling 160b26df74 Resolve "Clean up the top section of the cluster page" 2018-09-06 20:41:12 +00:00
Dennis Tang a9496c27c9 Resolve "Inform users of up to $500 offer for GCP account" 2018-05-07 18:06:02 +00:00
Eric Eastwood 2fb167fa3b Restore feature_highlight code
From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760

Was reverted in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373
2018-02-05 12:10:09 -06:00
Matija Čupić a85b85e1d8
Refactor .show_gke_cluster_integration_callout? 2018-02-05 14:33:49 +01:00
Matija Čupić 20714ee902
Change UserCallout feautre_name to enum 2018-02-03 00:18:25 +01:00
Matija Čupić 648826721f
Rename Callout to UserCallout 2018-02-02 22:51:03 +01:00