summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-214-15/+9
* Add Changelog entry for builds API commit data fixGrzegorz Bizon2016-06-211-0/+1
* Fix builds API response not including commit dataGrzegorz Bizon2016-06-215-13/+44
* Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2160-192/+766
|\
| * Add button to add .gitlab-ci.yml file17521-gitlab-ci-yml-templatesAlfredo Sumaran2016-06-201-0/+4
| * fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| * Add feature test for gitab CI dropdownAlfredo Sumaran2016-06-201-0/+30
| * Incorporate reviewZ.J. van de Weg2016-06-208-17/+34
| * Run rake gitlab:update_templatesZ.J. van de Weg2016-06-2024-19/+160
| * Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-202-1/+2
| * Add GitLab CI Yml dropdown selectorAlfredo Sumaran2016-06-205-2/+42
| * Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-208-80/+126
| * Add first templates for gitlab-ci dropdownZ.J. van de Weg2016-06-2015-0/+256
| * Refactor Gitlab::GitignoresZJ van de Weg2016-06-2012-143/+183
* | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-2125-129/+431
|\ \
| * | Update wordings according to:Lin Jen-Shin2016-06-213-4/+4
| * | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...feature/runner-lock-on-projectLin Jen-Shin2016-06-2010-14/+92
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-20223-825/+11032
| |\ \ \
| * | | | Add index for ci_runners.locked, feedback:Lin Jen-Shin2016-06-202-1/+14
| * | | | Rename according to:Lin Jen-Shin2016-06-205-20/+20
| * | | | Use .has-tooltip as suggested at:Lin Jen-Shin2016-06-201-2/+1
| * | | | Test for enabling/disabling runners from admin runner pageLin Jen-Shin2016-06-172-2/+36
| * | | | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-172-6/+1
| * | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-17418-3054/+16656
| |\ \ \ \
| * | | | | Use active tense, feedback from:test-merge-request-4093Lin Jen-Shin2016-06-161-9/+9
| * | | | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-161-1/+1
| * | | | | blank line between setup and expectation, feedback:Lin Jen-Shin2016-06-161-0/+4
| * | | | | Use FIXME instead, feedback from:Lin Jen-Shin2016-06-161-2/+2
| * | | | | Use font awesome instead of Unicode. Feedback from:Lin Jen-Shin2016-06-151-1/+2
| * | | | | Adopt the rename from ci_commits to ci_pipelinesLin Jen-Shin2016-06-152-2/+2
| * | | | | Fix typo. It's ivar and the column was called lockedLin Jen-Shin2016-06-151-1/+1
| * | | | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-144-4/+9
| * | | | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-projectLin Jen-Shin2016-06-144-4/+8
| |\ \ \ \ \
| | * | | | | Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-144-4/+8
| | * | | | | We're checking return value rather than rescuing exceptionsLin Jen-Shin2016-06-141-1/+1
| | * | | | | Prefer Runner#assign_to instead of creating directlyLin Jen-Shin2016-06-141-1/+1
| * | | | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-14582-1513/+3372
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-144-2/+18
| * | | | | | Rename specific_for to available_for:Lin Jen-Shin2016-06-143-9/+9
| * | | | | | Add a small locked icon if it's locked:Lin Jen-Shin2016-06-091-0/+2
| * | | | | | Tweak the wordings and grammar slightlyLin Jen-Shin2016-06-091-5/+4
| * | | | | | Updated doc description according to feedback:Lin Jen-Shin2016-06-091-3/+4
| * | | | | | Updated description for the formLin Jen-Shin2016-06-091-2/+2
| * | | | | | Extra tests inside shared_examples:Lin Jen-Shin2016-06-091-13/+25
| * | | | | | Merge conditions. Not worth an additional pointless method:Lin Jen-Shin2016-06-091-9/+3
| * | | | | | Renamed to available_for? Feedback from:Lin Jen-Shin2016-06-091-2/+2
| * | | | | | Remove Build#can_be_served? and rename Runner#can_serve? to can_pick?Lin Jen-Shin2016-06-095-124/+123
| * | | | | | Prefer string for describe, feedback from:Lin Jen-Shin2016-06-091-5/+5
| * | | | | | Update CHANGELOG and doc for locked runner featureLin Jen-Shin2016-06-092-0/+7
| * | | | | | Fixed a typo (remove extra n)Lin Jen-Shin2016-06-091-2/+2
View Lorry Controller Status