diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 17:11:48 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 17:11:48 +0000 |
| commit | e84afa8bed23ac0192ac795459434a0c48ba4108 (patch) | |
| tree | 84a66b7b9d5e3848d4ab3133e6bce39231be0b60 /app/assets | |
| parent | a41bff62e469b1d5d521648260e122a7110594cc (diff) | |
| parent | 12fe94c388ae9ec73e34852ef7d7b90f2f347df7 (diff) | |
| download | gitlab-ce-e84afa8bed23ac0192ac795459434a0c48ba4108.tar.gz | |
Merge branch '26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages' into 'master'
Resolve "Combine Deploy Keys and Push Rules and Mirror Repository and Protect Branches settings pages"
Closes #26732
See merge request !8731
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 4f0c85f4161..546bdc9c8d7 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -287,7 +287,7 @@ const UserCallout = require('./user_callout'); case 'search:show': new Search(); break; - case 'projects:protected_branches:index': + case 'projects:repository:show': new gl.ProtectedBranchCreate(); new gl.ProtectedBranchEditList(); break; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 09b85db7d45..4914933430f 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -746,6 +746,8 @@ pre.light-well { } .protected-branches-list { + margin-bottom: 30px; + a { color: $gl-text-color; |