summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Narrow environment payload by using basic project details resource28598-narrow-environment-payload-by-using-basic-projectOswaldo Ferreira2017-03-064-3/+10
* 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
|\ \ \ \ \
| * | | | | Use gitlab-workhorse 1.4.0Jacob Vosmaer2017-03-062-1/+5
| |/ / / /
* | | | | Merge branch '28704-fullscreen-zen-mode-is-broken' into 'master' Annabel Dunstone Gray2017-03-062-1/+6
|\ \ \ \ \
| * | | | | Set max for Zen mode textarea to screen height28704-fullscreen-zen-mode-is-brokenSam Rose2017-03-032-1/+6
* | | | | | Merge branch '25503_issues_finder_performance' into 'master' Sean McGivern2017-03-064-14/+35
|\ \ \ \ \ \
| * | | | | | Improve issues filtering performanceJarka Kadlecova2017-03-064-14/+35
* | | | | | | Merge branch 'second-nav-spacing-mobile' into 'master' Annabel Dunstone Gray2017-03-062-10/+20
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Changed the styling to allow bigger link targets on mobilesecond-nav-spacing-mobilePhil Hughes2017-03-061-3/+18
| * | | | | | Fixed spacing in mobile secondary navPhil Hughes2017-03-022-9/+4
* | | | | | | Merge branch 'api-drop-subscribed' into 'master' Sean McGivern2017-03-0624-36/+451
|\ \ \ \ \ \ \
| * | | | | | | Remove "subscribed" field from API responses returning list of issues or merg...api-drop-subscribedAdam Niedzielski2017-03-0621-32/+447
| * | | | | | | Move schema definitions for our public API to a separate directoryAdam Niedzielski2017-03-063-4/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'gitaly-0.3.0' into 'master' Sean McGivern2017-03-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add gitaly server dependencyJacob Vosmaer2017-03-061-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-0625-183/+702
|\ \ \ \ \ \
| * | | | | | Fix UserBasicintroduce-pipeline-triggersKamil Trzcinski2017-03-061-1/+1
| * | | | | | Rename `/take` to `/take_ownership`, expose `owner` in `v3`.Kamil Trzcinski2017-03-064-7/+8
| * | | | | | Update after reviewKamil Trzcinski2017-03-063-1/+5
| * | | | | | Lint docKamil Trzcinski2017-03-051-2/+2
| * | | | | | Move foreign key to separate migrationKamil Trzcinski2017-03-053-3/+13
| * | | | | | Fix import model attributesKamil Trzcinski2017-03-052-0/+3
View Lorry Controller Status