Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- 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

e394ad13

Commit e394ad13 authored 8 years ago by Alfredo Sumaran

Downloads
- Plain Diff

Merge branch 'single-edit-comment-widget-2' into 'master'

Refactor discussion edit widget to have only one at a time.

Closes #23227

See merge request !8356

parents 5c46a459 36412ee2

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/gl_form.js 1 addition, 1 deletion

app/assets/javascripts/gl_form.js
app/assets/javascripts/lib/utils/common_utils.js 14 additions, 2 deletions

app/assets/javascripts/lib/utils/common_utils.js
app/assets/javascripts/notes.js 111 additions, 45 deletions

app/assets/javascripts/notes.js
app/assets/stylesheets/pages/note_form.scss 16 additions, 0 deletions

app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/notes.scss 0 additions, 2 deletions

app/assets/stylesheets/pages/notes.scss
app/views/projects/notes/_edit_form.html.haml 9 additions, 5 deletions

app/views/projects/notes/_edit_form.html.haml
app/views/projects/notes/_note.html.haml 3 additions, 1 deletion

app/views/projects/notes/_note.html.haml
app/views/projects/notes/_notes_with_form.html.haml 3 additions, 0 deletions

app/views/projects/notes/_notes_with_form.html.haml
changelogs/unreleased/single-edit-comment-widget-2.yml 5 additions, 0 deletions

changelogs/unreleased/single-edit-comment-widget-2.yml
spec/features/notes_on_merge_requests_spec.rb 27 additions, 13 deletions

spec/features/notes_on_merge_requests_spec.rb
spec/javascripts/notes_spec.js 1 addition, 0 deletions

spec/javascripts/notes_spec.js
spec/javascripts/zen_mode_spec.js 7 additions, 7 deletions

spec/javascripts/zen_mode_spec.js

with 197 additions and 76 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