Merge branch 'protected-branches-bundle' into 'master'

Create protected branches bundle Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/645 See merge request !6909

Merge branch 'protected-branches-bundle' into 'master'
5af17a75 · Jacob Schatz · a7307c8a · 3bace669 · 5af17a75 · 5af17a75
Commit 5af17a75 authored Oct 20, 2016 by Jacob Schatz
8 changed files
--- a/app/assets/javascripts/protected_branch_access_dropdown.js.es6
+++ b/app/assets/javascripts/protected_branch_access_dropdown.js.es6
--- a/app/assets/javascripts/protected_branch_create.js.es6
+++ b/app/assets/javascripts/protected_branch_create.js.es6
--- a/app/assets/javascripts/protected_branch_dropdown.js.es6
+++ b/app/assets/javascripts/protected_branch_dropdown.js.es6
--- a/app/assets/javascripts/protected_branch_edit.js.es6
+++ b/app/assets/javascripts/protected_branch_edit.js.es6
--- a/app/assets/javascripts/protected_branch_edit_list.js.es6
+++ b/app/assets/javascripts/protected_branch_edit_list.js.es6
--- a/app/assets/javascripts/protected_branches/protected_branches_bundle.js
+++ b/app/assets/javascripts/protected_branches/protected_branches_bundle.js
+/*= require_tree . */
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
 - page_title "Protected branches"
+- content_for :page_specific_javascripts do
+  = page_specific_javascript_tag('protected_branches/protected_branches_bundle.js')

 .row.prepend-top-default.append-bottom-default
  .col-lg-3

--- a/config/application.rb
+++ b/config/application.rb
@@ -87,6 +87,7 @@ module Gitlab
    config.assets.precompile << "users/users_bundle.js"
    config.assets.precompile << "network/network_bundle.js"
    config.assets.precompile << "profile/profile_bundle.js"
+    config.assets.precompile << "protected_branches/protected_branches_bundle.js"
    config.assets.precompile << "diff_notes/diff_notes_bundle.js"
    config.assets.precompile << "boards/boards_bundle.js"
    config.assets.precompile << "merge_conflicts/merge_conflicts_bundle.js"