kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/assets/javascripts
History
Jacob Schatz 1b338d59f6 Merge branch 'label-flash' into 'master' 
Fix error message for existing labels in right sidebar.

## What does this MR do?
Fixes flash notification in right sidebar, if we want to create an existing label.

## Are there points in the code the reviewer needs to double check?
Nope.

## Why was this MR needed?
Because it was broken.

## What are the relevant issue numbers?
Fixes #20117 

## Screenshots (if relevant)

#### Before
![https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png)

#### After
![Screen_Shot_2016-07-28_at_13.38.03](/uploads/1dca73bf4c1b14c0044952a5032d9325/Screen_Shot_2016-07-28_at_13.38.03.png)
![Screen_Shot_2016-07-28_at_13.41.18](/uploads/9b814f7f03d0314050659e1ac6ace290/Screen_Shot_2016-07-28_at_13.41.18.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- Tests
  - [ ] ~~Added for this feature/bug~~
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5546
2016-08-17 00:38:31 +00:00
..
behaviors ES6ify all the things! 2016-07-24 23:45:11 +03:00
blob Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00
commit ES6ify all the things! 2016-07-24 23:45:11 +03:00
extensions ES6ify all the things! 2016-07-24 23:45:11 +03:00
graphs ES6ify all the things! 2016-07-24 23:45:11 +03:00
lib Update timeago to shorter representation 2016-08-04 15:01:37 -05:00
network ES6ify all the things! 2016-07-24 23:45:11 +03:00
profile ES6ify all the things! 2016-07-24 23:45:11 +03:00
templates Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00
u2f ES6ify all the things! 2016-07-24 23:45:11 +03:00
users ES6ify all the things! 2016-07-24 23:45:11 +03:00
activities.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
admin.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
api.js Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00
application.js Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00
aside.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
autosave.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
awards_handler.js Fix awardable button mutuality loading spinners 2016-08-10 16:29:11 -05:00
breakpoints.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
broadcast_message.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
build.js Fixed artifacts expire date in FF 2016-07-27 19:38:22 +01:00
build_artifacts.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
commit.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
commits.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
compare.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
compare_autocomplete.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
confirm_danger_modal.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
copy_to_clipboard.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
diff.js Add unfold links for Side-by-Side view 2016-08-04 09:09:59 +03:00
dispatcher.js Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00
dropzone_input.js Rename markdown_preview routes to preview_markdown 2016-08-11 15:54:18 +02:00
due_date_select.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
files_comment_button.js Don't show comment button in gutter of diffs on MR discussion tab 2016-07-25 22:03:07 -06:00
flash.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
gfm_auto_complete.js Remove delay when hitting Reply... button on page with a lot of discussions 2016-08-01 16:55:24 -07:00
gl_dropdown.js No need to pass event as a parameter 2016-08-05 17:19:01 -05:00
gl_form.js Remove delay when hitting Reply... button on page with a lot of discussions 2016-08-01 16:55:24 -07:00
group_avatar.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
groups.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
groups_select.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
importer_status.js Remove inline scripts from import pages. 2016-07-26 14:58:01 -06:00
issuable.js Updated failing tests 2016-08-13 00:57:40 -05:00
issuable_context.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
issuable_form.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
issue.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
issue_status_select.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
issues-bulk-assignment.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
LabelManager.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
labels.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
labels_select.js Fix error message for existing labels. 2016-08-11 01:15:27 +03:00
layout_nav.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
line_highlighter.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
logo.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
merge_request.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
merge_request_tabs.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
merge_request_widget.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
merged_buttons.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
milestone.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
milestone_select.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
namespace_select.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
new_branch_form.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
new_commit_form.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
notes.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
notifications_dropdown.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
notifications_form.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
pager.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
preview_markdown.js Rename markdown_preview routes to preview_markdown 2016-08-11 15:54:18 +02:00
project.js Merge branch 'master' into ref-switcher-enter-submit 2016-08-03 09:08:24 +01:00
project_avatar.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
project_find_file.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
project_fork.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
project_import.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
project_members.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
project_new.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
project_select.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
project_show.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
projects_list.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
protected_branch_access_dropdown.js.es6 Set for for labels and ID for dropdowns on create form 2016-08-05 17:19:01 -05:00
protected_branch_create.js.es6 Backport changes from gitlab-org/gitlab-ee!581 to CE. 2016-08-16 11:05:14 +05:30
protected_branch_dropdown.js.es6 Prevent setting HTML directly from the JS 2016-08-05 17:19:01 -05:00
protected_branch_edit.js.es6 Backport changes from gitlab-org/gitlab-ee!581 to CE. 2016-08-16 11:05:14 +05:30
protected_branch_edit_list.js.es6 Wrap classes with IIFE and define it inside gl namespace 2016-08-05 17:19:01 -05:00
right_sidebar.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
search.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
search_autocomplete.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
shortcuts.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
shortcuts_blob.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
shortcuts_dashboard_navigation.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
shortcuts_find_file.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
shortcuts_issuable.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
shortcuts_navigation.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
shortcuts_network.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
sidebar.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
single_file_diff.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
star.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
subscription.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
subscription_select.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
syntax_highlight.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
todos.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
tree.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
user.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
user_tabs.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
users_select.js fix: respect data-attribute 'skip-users' in user_selects 2016-08-05 16:49:11 +01:00
wikis.js ES6ify all the things! 2016-07-24 23:45:11 +03:00
zen_mode.js ES6ify all the things! 2016-07-24 23:45:11 +03:00