diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 21:06:21 +0300 |
| commit | 6d59e989185a7d2645792b713d1b5d95d46651fd (patch) | |
| tree | f89d869a6c557a3e6e0b9305290259ab1d6fb589 /app/views | |
| parent | 5c521d1f9b1e389e2f9b2b5fccf3798159a10f8d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/notifications/_group_settings.html.haml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 0e6c16f0f06..457d05b4a97 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -5,6 +5,8 @@ = auto_discovery_link_tag(:atom, group_url(@group, rss_url_options), title: "#{@group.name} activity") %div{ class: [("limit-container-width" unless fluid_layout)] } + = render_if_exists 'trials/banner', namespace: @group + = render 'groups/home_panel' .groups-listing{ data: { endpoints: { default: group_children_path(@group, format: :json), shared: group_shared_projects_path(@group, format: :json) } } } diff --git a/app/views/profiles/notifications/_group_settings.html.haml b/app/views/profiles/notifications/_group_settings.html.haml index 1776d260e19..33b0aa93d84 100644 --- a/app/views/profiles/notifications/_group_settings.html.haml +++ b/app/views/profiles/notifications/_group_settings.html.haml @@ -12,5 +12,5 @@ = render 'shared/notifications/button', notification_setting: setting, emails_disabled: emails_disabled .table-section.section-30 - = form_for @user.notification_settings.find { |ns| ns.source == group }, url: profile_notifications_group_path(group), method: :put, html: { class: 'update-notifications' } do |f| + = form_for setting, url: profile_notifications_group_path(group), method: :put, html: { class: 'update-notifications' } do |f| = f.select :notification_email, @user.all_emails, { include_blank: 'Global notification email' }, class: 'select2 js-group-notification-email' |