Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab FOSS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

36d48120

There was a problem fetching the pipeline summary.

Commit 36d48120 authored 8 years ago by Felipe Artur

Downloads
- Plain Diff

merge master into issue_3359_3

parents 2674b548 92e18354

No related branches found

No related tags found

1 merge request!4857Insert notification settings dropdown into groups

Pipeline #

Changes 10
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 1 deletion

CHANGELOG
app/assets/javascripts/dispatcher.js.coffee 1 addition, 0 deletions

app/assets/javascripts/dispatcher.js.coffee
app/assets/stylesheets/framework/blocks.scss 1 addition, 1 deletion

app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/pages/groups.scss 1 addition, 5 deletions

app/assets/stylesheets/pages/groups.scss
app/controllers/groups_controller.rb 4 additions, 4 deletions

app/controllers/groups_controller.rb
app/controllers/notification_settings_controller.rb 6 additions, 8 deletions

app/controllers/notification_settings_controller.rb
app/helpers/notifications_helper.rb 1 addition, 1 deletion

app/helpers/notifications_helper.rb
app/views/groups/show.html.haml 6 additions, 3 deletions

app/views/groups/show.html.haml
doc/workflow/notifications.md 2 additions, 0 deletions

doc/workflow/notifications.md
spec/controllers/notification_settings_controller_spec.rb 6 additions, 6 deletions

spec/controllers/notification_settings_controller_spec.rb

with 29 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment