Merge branch 'remove-log' of github.com:travis-ci/travis-web into remove-log

This commit is contained in:
Piotr Sarnacki 2015-01-09 15:03:46 +01:00
commit 23cebc4826
2 changed files with 9 additions and 1 deletions

View File

@ -235,6 +235,12 @@ Travis.reopen
@popup('remove-log-popup')
return false
removeLogPopup: ->
if @get('canRemoveLog')
@set('active', true)
@popup(event)
event.stopPropagation()
hasPermission: (->
if permissions = @get('currentUser.permissions')
permissions.contains parseInt(@get('repo.id'))

View File

@ -73,7 +73,7 @@
margin-top: 10px
#regenerate-key,
#remove-log
#remove-log-popup
.cancel
text-decoration: underline
p
@ -85,6 +85,8 @@
margin-bottom: 5px
a.button
font-size: 13px
strong
color: $red
#status-images, #regenerate-key
input