summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'see-if-we-can-reproduce' into 'master'"revert-528f3ca2Jacob Schatz2017-03-061-1/+0
* Merge branch 'see-if-we-can-reproduce' into 'master' Jacob Schatz2017-03-061-0/+1
|\
| * [ci skip]Jacob Schatz2017-03-061-0/+1
* | Merge branch 'backup_storage_class' into 'master' Rémy Coutable2017-03-065-1/+11
|\ \
| * | Add storage class configuration option for Amazon S3 remote backupsJon Keys2017-02-285-1/+11
* | | Merge branch 'remove-vendored-raphael-library' into 'master' Filipa Lacerda2017-03-0612-10207/+425
|\ \ \
| * | | remove unnecessary IIFEremove-vendored-raphael-libraryMike Greiling2017-03-051-12/+10
| * | | refactor Network classMike Greiling2017-03-052-18/+15
| * | | refactor BranchGraph classMike Greiling2017-03-054-392/+388
| * | | remove manually vendored raphael library in favor of node moduleMike Greiling2017-03-055-9784/+0
| * | | merge raphael library into the network bundleMike Greiling2017-03-054-2/+13
* | | | Merge branch '27523-make-stuck-build-detection-more-performant' into 'master' Kamil Trzciński2017-03-067-82/+198
|\ \ \ \
| * | | | Renable StuckCiBuildsWorker to StucjCiJobsWorker27523-make-stuck-build-detection-more-performantTomasz Maczukin2017-03-034-35/+35
| * | | | Make 'joins' line shorterTomasz Maczukin2017-03-011-1/+1
| * | | | Fix rubocop offensesTomasz Maczukin2017-03-012-6/+3
| * | | | Add minor updatesTomasz Maczukin2017-03-012-9/+32
| * | | | Improve builds search queryTomasz Maczukin2017-03-011-1/+1
| * | | | Add Gitlab::OptimisticLocking for build droppingTomasz Maczukin2017-03-011-1/+3
| * | | | Add exclusive lease for stuck_ci_builds_workerTomasz Maczukin2017-03-012-3/+27
| * | | | Update default configuration of stuck_ci_builds_worker cron intervalTomasz Maczukin2017-03-013-2/+6
| * | | | Update stuck and outdated builds cleanup workerTomasz Maczukin2017-03-012-35/+101
* | | | | Merge branch 'zj-builds-to-jobs-api' into 'master' Kamil Trzciński2017-03-0625-312/+1517
|\ \ \ \ \
| * | | | | Remove docs for removed endpointzj-builds-to-jobs-apiZ.J. van de Weg2017-03-061-104/+0
| * | | | | Incorporate review, drop old endpointZ.J. van de Weg2017-03-065-101/+13
| * | | | | Rename build to job in the docsZ.J. van de Weg2017-03-066-113/+113
| * | | | | Add changelog entryZ.J. van de Weg2017-03-062-1/+5
| * | | | | Fix all testsToon Claes2017-03-0611-350/+220
| * | | | | Pick API files from 8.16.6Z.J. van de Weg2017-03-068-2/+625
| * | | | | Keep entities the same for API v3Z.J. van de Weg2017-03-061-0/+143
| * | | | | Update entities, rename from builds to jobsZ.J. van de Weg2017-03-063-23/+22
| * | | | | Rename Builds to Jobs in the APIZ.J. van de Weg2017-03-067-69/+827
* | | | | | Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into 'mas...Sean McGivern2017-03-0622-20/+368
|\ \ \ \ \ \
| * | | | | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftoversPawel Chojnacki2017-03-065-11/+9
| * | | | | | align schema.rb with upstream and fix rubocop warning about not freezing muta...Pawel Chojnacki2017-03-063-5/+5
| * | | | | | Cleanup test phases by introducing request_from_ip and operation_from_ip helersPawel Chojnacki2017-03-061-21/+19
| * | | | | | Make Warden set_user hook validate user ip uniqunessPawel Chojnacki2017-03-066-23/+28
| * | | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ...Pawel Chojnacki2017-03-0615-86/+60
| * | | | | | Cleanup common code in Unique Ips testsPawel Chojnacki2017-03-065-74/+60
| * | | | | | Add admin settings entriesPawel Chojnacki2017-03-063-0/+35
| * | | | | | Add changelogPawel Chojnacki2017-03-061-0/+4
| * | | | | | Cleanup RSpec testsPawel Chojnacki2017-03-064-73/+47
| * | | | | | Test various login scenarios if the limit gets enforcedPawel Chojnacki2017-03-069-36/+150
| * | | | | | Cleanup formattingPawel Chojnacki2017-03-064-6/+4
| * | | | | | Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-0612-16/+278
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'gitlab-database-fix' into 'master' Douwe Maan2017-03-061-3/+3
|\ \ \ \ \ \
| * | | | | | removes redundant code from gitlab database filegitlab-database-fixTiago Botelho2017-03-021-3/+3
* | | | | | | Merge branch 'fix-mentioned-issues-for-external-trackers' into 'master' Sean McGivern2017-03-066-21/+45
|\ \ \ \ \ \ \
| * | | | | | | DRY up {jira,kubernets}_project factoriesfix-mentioned-issues-for-external-trackersSean McGivern2017-03-061-21/+2
| * | | | | | | Fix issues mentioned but not closed for JIRASean McGivern2017-03-065-0/+43
* | | | | | | | Merge branch 'workhorse-1.4.0' into 'master' Sean McGivern2017-03-062-1/+5
|\ \ \ \ \ \ \ \
View Lorry Controller Status