summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-091-25/+33
|\
| * Request only the LDAP attributes we needDrew Blessing2016-09-091-25/+33
* | Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-092-2/+7
* | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-092-3/+53
|\ \ | |/ |/|
| * Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-052-3/+53
* | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-081-0/+141
|\ \
| * | Struct.new could take a block for defining methods, feedback:smart-pipeline-durationLin Jen-Shin2016-09-081-2/+1
| * | Split try_merge_period into overlap? and merge:Lin Jen-Shin2016-09-081-7/+9
| * | Be more specific since it's not needed to be generic now,Lin Jen-Shin2016-09-061-3/+5
| * | Sort by database, feedback:Lin Jen-Shin2016-09-061-2/+4
| * | Just use module because there's nothing to save, feedback:Lin Jen-Shin2016-09-061-14/+10
| * | Use sum, feedback:Lin Jen-Shin2016-09-061-3/+1
| * | Forget about pending duration for now, need more discussionLin Jen-Shin2016-09-051-39/+10
| * | Just sum all the queuing time, indication for needing more runnersLin Jen-Shin2016-09-021-6/+7
| * | Actually we still need to use total - running to get:Lin Jen-Shin2016-09-021-3/+4
| * | Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-0228-124/+229
| |\ \
| * | | Calculate real queueing time to exclude gaps from:Lin Jen-Shin2016-09-021-14/+14
| * | | Use guard clause, feedback:Lin Jen-Shin2016-08-311-11/+9
| * | | Introduction to PipelineDurationLin Jen-Shin2016-08-311-0/+98
| * | | Fix renamingLin Jen-Shin2016-08-301-1/+1
| * | | Avoid shadowing method name. Just use existing methodLin Jen-Shin2016-08-301-2/+2
| * | | Rename to periods since it's easier to understandLin Jen-Shin2016-08-301-22/+22
| * | | Use algorithm from Kamil:Lin Jen-Shin2016-08-301-28/+9
| * | | build might not start yetLin Jen-Shin2016-08-301-1/+1
| * | | no builds no pendingLin Jen-Shin2016-08-291-0/+2
| * | | Smartly calculate real running time and pending timeLin Jen-Shin2016-08-291-0/+90
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-081-1/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-09-081-1/+2
| |\ \ \ \
| | * | | | Fixed gitlab.com importer missing confidential attributeJames Lopez2016-09-051-1/+2
| | | |_|/ | | |/| |
* | | | | Merge branch 'change-update-interval-of-runners' into 'master' Yorick Peterse2016-09-082-4/+6
|\ \ \ \ \
| * | | | | Change update interval of runners when trying to preserve contacted_atchange-update-interval-of-runnersKamil Trzcinski2016-09-072-4/+6
* | | | | | Rename `gl_user_id` to `gitlab_user_id` in importer classesAndrew Smith2016-09-086-10/+10
| |/ / / / |/| | | |
* | | | | Merge branch 'refactor/ci-config-add-logical-validation' into 'master' Rémy Coutable2016-09-0711-93/+120
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into refactor/ci-config-add-logical-validationrefactor/ci-config-add-logical-validationGrzegorz Bizon2016-09-0341-244/+352
| |\ \ \ \ \
| * | | | | | Add method that returns commands for ci job entryGrzegorz Bizon2016-08-292-7/+7
| * | | | | | Do not override job nodes in legacy ci config codeGrzegorz Bizon2016-08-291-5/+5
| * | | | | | Make it possible to inherit global ci config nodesGrzegorz Bizon2016-08-291-0/+15
| * | | | | | Add [] method for accessing ci entry dependenciesGrzegorz Bizon2016-08-251-0/+4
| * | | | | | Remove temporary stub method from ci config nodesGrzegorz Bizon2016-08-253-8/+2
| * | | | | | Expose compose method in the ci config entry nodesGrzegorz Bizon2016-08-256-44/+47
| * | | | | | Rename unspecified and undefined CI config nodesGrzegorz Bizon2016-08-254-42/+46
| * | | | | | Inject dependencies into each CI config entry nodeGrzegorz Bizon2016-08-255-8/+15
* | | | | | | Merge branch 'fix-allowed-conflict-size' into 'master' Rémy Coutable2016-09-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-071-1/+1
* | | | | | | | Use PipelinesFinder in Pipelines APIZ.J. van de Weg2016-09-071-1/+4
|/ / / / / / /
* | | | | | | Improve curl commend, remove blank linesKatarzyna Kobierska2016-09-071-2/+0
* | | | | | | Fix invalid curl commandKatarzyna Kobierska2016-09-071-4/+5
* | | | | | | Add Documentation to Ci Lint APIKatarzyna Kobierska2016-09-071-3/+3
* | | | | | | Code refactorKatarzyna Kobierska2016-09-072-1/+2
* | | | | | | Improve codeKatarzyna Kobierska2016-09-072-23/+16
View Lorry Controller Status