delta/gitlab/gitlab-ce.git/app/views/shared, branch trigger-source

Merge branch 'back-port-locked-milestones-to-ce' into 'master'

2017-05-30T14:53:57+00:00

`canEdit` changes for conditional remove button on filtered search -- EE backport

Closes gitlab-ee#2433

See merge request !11696

Merge branch '19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabled' into 'master'

2017-05-30T13:32:39+00:00

'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled

Closes #19107

See merge request !11754

Update looks job log

2017-05-30T08:43:13+00:00

Merge branch '2472-assignee-dropdown-does-not-display-selected-assignee-ce' into 'master'

2017-05-30T07:56:36+00:00

Assignee dropdown does not display selected assignee

Closes #2472

See merge request !11744

'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled

2017-05-30T04:35:49+00:00

Backport MR from EE

2017-05-26T21:27:30+00:00

Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master'

2017-05-26T19:42:02+00:00

Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form

Closes #32447 and #32907

See merge request !11558

More consistent padding of notes, system notes, and note form

2017-05-26T19:01:42+00:00

Merge branch 'issuable-form-create-label-sub-groups' into 'master'

2017-05-26T15:32:36+00:00

Fixed create new label form in issue form not working for sub-group projects

Closes #32906

See merge request !11703

Backport canEdit changes for conditional remove button

2017-05-26T07:42:13+00:00

Backport Fix locked milestone in boards being remove-able.
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1963

Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/2433

Conflicts:
	app/assets/javascripts/boards/boards_bundle.js
	app/assets/javascripts/boards/filtered_search_boards.js
	app/assets/javascripts/filtered_search/filtered_search_manager.js
	spec/features/boards/boards_spec.rb