summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-4' into 'master' Robert Speicher2016-09-131-1/+1
|\
| * update gitlab shell secret file also when it is emptyElan Ruusamäe2016-09-131-1/+1
* | Merge branch '20780-import-github-release-notes' into 'master' Robert Speicher2016-09-132-0/+36
|\ \
| * | Import GitHub release notesAndrew Smith2016-09-132-0/+36
| |/
* | Avoid protected branches checks when verifying access without branch namePaco Guzman2016-09-131-0/+1
* | Merge branch 'fix-commit-status' into 'master' Rémy Coutable2016-09-131-26/+28
|\ \ | |/ |/|
| * Fix an error where we were unable to create a CommitStatus for running statefix-commit-statusKamil Trzcinski2016-09-121-26/+28
* | Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-124-6/+23
|\ \ | |/ |/|
| * Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-084-6/+23
* | Merge branch 'rc-api-use-search-globalservice-in-projects-search-api' into 'm...Rémy Coutable2016-09-121-12/+3
|\ \
| * | Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-apiRémy Coutable2016-09-121-12/+3
| * | Search should compare only the lowercase versions of the project namesRazzeee2016-09-091-1/+1
* | | Merge branch 'fix-api-sorting' into 'master' Douwe Maan2016-09-121-3/+9
|\ \ \
| * | | Fix API issues sortingfix-api-sortingSean McGivern2016-09-091-3/+9
| |/ /
* | | Merge branch '19359-api-for-notification-settings' into 'master' Rémy Coutable2016-09-123-1/+114
|\ \ \
| * | | Add notification_settings API callsMarc Siegfriedt2016-09-093-1/+114
* | | | 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
| |\ \ \ \ \
View Lorry Controller Status