mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-01-12 02:25:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #556 from bradrydzewski/master

Browse source 
fix for #554 and #552
This commit is contained in:
Brad Rydzewski 2014-10-13 19:39:36 -07:00
commit e1072e9258
4 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -117,7 +117,7 @@ Or you can use environment variables
```sh ```sh
# custom database settings # custom http server settings
export DRONE_SERVER_PORT="" export DRONE_SERVER_PORT=""
export DRONE_SERVER_SSL_KEY="" export DRONE_SERVER_SSL_KEY=""
export DRONE_SERVER_SSL_CERT="" export DRONE_SERVER_SSL_CERT=""

2
server/app/styles/drone.css
View file

File diff suppressed because one or more lines are too long

21
server/app/styles/drone.less
View file

@ -961,6 +961,27 @@ nav {
padding:10px 20px; padding:10px 20px;
margin-top:20px; margin-top:20px;
} }
select,
input[type="number"] {
.border_box();
padding:8px;
font-size:14px;
margin-bottom:15px;
border: 1px solid #DDD;
}
span.seconds {
color:#212121;
margin-left:10px;
}
span.minutes {
color:#212121;
&:before {
content:'(';
}
&:after {
content:')';
}
}
} }
} }

21
server/app/views/repo_edit.html
View file

@ -34,6 +34,7 @@
<label for="privileged"></label> <label for="privileged"></label>
<span>Enable Privileged mode</span> <span>Enable Privileged mode</span>
</div> </div>
<button ng-click="save()" class="pure-button pure-button-primary ladda-button expand-right" data-loading='{{ saving }}' ng-model="button" ng-disabled='saving'> <button ng-click="save()" class="pure-button pure-button-primary ladda-button expand-right" data-loading='{{ saving }}' ng-model="button" ng-disabled='saving'>
Save Flags Save Flags
</button> </button>
@ -42,6 +43,26 @@
</div> </div>
</section> </section>
<section ng-if="user.admin == true">
<div class="pure-g">
<div class="pure-u-1">
<div>
<h2>Build Timeout</h2>
<div>
<input type="number" ng-model="repo.timeout" id="timeout" integer />
<span ng-if="repo.timeout > 0" class="seconds">Seconds</span>
<span ng-if="repo.timeout > 0" class="minutes">{{ repo.timeout / 60 | number:0 }} minutes</span>
</div>
<button ng-click="save()" class="pure-button pure-button-primary ladda-button expand-right" data-loading='{{ saving }}' ng-model="button" ng-disabled='saving'>
Save Timeout
</button>
</div>
</div>
</div>
</section>
<section> <section>
<div class="pure-g"> <div class="pure-g">
<div class="pure-u-1"> <div class="pure-u-1">