Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-06 | 476 | -1066/+4453 |
|\ | |||||
| * | Merge branch 'zj-builds-to-jobs-api' into 'master' | Kamil TrzciĆski | 2017-03-06 | 25 | -312/+1517 |
| |\ | |||||
| | * | Remove docs for removed endpointzj-builds-to-jobs-api | Z.J. van de Weg | 2017-03-06 | 1 | -104/+0 |
| | * | Incorporate review, drop old endpoint | Z.J. van de Weg | 2017-03-06 | 5 | -101/+13 |
| | * | Rename build to job in the docs | Z.J. van de Weg | 2017-03-06 | 6 | -113/+113 |
| | * | Add changelog entry | Z.J. van de Weg | 2017-03-06 | 2 | -1/+5 |
| | * | Fix all tests | Toon Claes | 2017-03-06 | 11 | -350/+220 |
| | * | Pick API files from 8.16.6 | Z.J. van de Weg | 2017-03-06 | 8 | -2/+625 |
| | * | Keep entities the same for API v3 | Z.J. van de Weg | 2017-03-06 | 1 | -0/+143 |
| | * | Update entities, rename from builds to jobs | Z.J. van de Weg | 2017-03-06 | 3 | -23/+22 |
| | * | Rename Builds to Jobs in the API | Z.J. van de Weg | 2017-03-06 | 7 | -69/+827 |
| * | | Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into 'mas... | Sean McGivern | 2017-03-06 | 22 | -20/+368 |
| |\ \ | |||||
| | * | | Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers | Pawel Chojnacki | 2017-03-06 | 5 | -11/+9 |
| | * | | align schema.rb with upstream and fix rubocop warning about not freezing muta... | Pawel Chojnacki | 2017-03-06 | 3 | -5/+5 |
| | * | | Cleanup test phases by introducing request_from_ip and operation_from_ip helers | Pawel Chojnacki | 2017-03-06 | 1 | -21/+19 |
| | * | | Make Warden set_user hook validate user ip uniquness | Pawel Chojnacki | 2017-03-06 | 6 | -23/+28 |
| | * | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ... | Pawel Chojnacki | 2017-03-06 | 15 | -86/+60 |
| | * | | Cleanup common code in Unique Ips tests | Pawel Chojnacki | 2017-03-06 | 5 | -74/+60 |
| | * | | Add admin settings entries | Pawel Chojnacki | 2017-03-06 | 3 | -0/+35 |
| | * | | Add changelog | Pawel Chojnacki | 2017-03-06 | 1 | -0/+4 |
| | * | | Cleanup RSpec tests | Pawel Chojnacki | 2017-03-06 | 4 | -73/+47 |
| | * | | Test various login scenarios if the limit gets enforced | Pawel Chojnacki | 2017-03-06 | 9 | -36/+150 |
| | * | | Cleanup formatting | Pawel Chojnacki | 2017-03-06 | 4 | -6/+4 |
| | * | | Allow limiting logging in users from too many different IPs. | Pawel Chojnacki | 2017-03-06 | 12 | -16/+278 |
| * | | | Merge branch 'gitlab-database-fix' into 'master' | Douwe Maan | 2017-03-06 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | removes redundant code from gitlab database filegitlab-database-fix | Tiago Botelho | 2017-03-02 | 1 | -3/+3 |
| * | | | | Merge branch 'fix-mentioned-issues-for-external-trackers' into 'master' | Sean McGivern | 2017-03-06 | 6 | -21/+45 |
| |\ \ \ \ | |||||
| | * | | | | DRY up {jira,kubernets}_project factoriesfix-mentioned-issues-for-external-trackers | Sean McGivern | 2017-03-06 | 1 | -21/+2 |
| | * | | | | Fix issues mentioned but not closed for JIRA | Sean McGivern | 2017-03-06 | 5 | -0/+43 |
| * | | | | | Merge branch 'workhorse-1.4.0' into 'master' | Sean McGivern | 2017-03-06 | 2 | -1/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Use gitlab-workhorse 1.4.0 | Jacob Vosmaer | 2017-03-06 | 2 | -1/+5 |
| | |/ / / / | |||||
| * | | | | | Merge branch '28704-fullscreen-zen-mode-is-broken' into 'master' | Annabel Dunstone Gray | 2017-03-06 | 2 | -1/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Set max for Zen mode textarea to screen height28704-fullscreen-zen-mode-is-broken | Sam Rose | 2017-03-03 | 2 | -1/+6 |
| * | | | | | | Merge branch '25503_issues_finder_performance' into 'master' | Sean McGivern | 2017-03-06 | 4 | -14/+35 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Improve issues filtering performance | Jarka Kadlecova | 2017-03-06 | 4 | -14/+35 |
| * | | | | | | | Merge branch 'second-nav-spacing-mobile' into 'master' | Annabel Dunstone Gray | 2017-03-06 | 2 | -10/+20 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Changed the styling to allow bigger link targets on mobilesecond-nav-spacing-mobile | Phil Hughes | 2017-03-06 | 1 | -3/+18 |
| | * | | | | | | Fixed spacing in mobile secondary nav | Phil Hughes | 2017-03-02 | 2 | -9/+4 |
| * | | | | | | | Merge branch 'api-drop-subscribed' into 'master' | Sean McGivern | 2017-03-06 | 24 | -36/+451 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove "subscribed" field from API responses returning list of issues or merg...api-drop-subscribed | Adam Niedzielski | 2017-03-06 | 21 | -32/+447 |
| | * | | | | | | | Move schema definitions for our public API to a separate directory | Adam Niedzielski | 2017-03-06 | 3 | -4/+4 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Merge branch 'gitaly-0.3.0' into 'master' | Sean McGivern | 2017-03-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Add gitaly server dependency | Jacob Vosmaer | 2017-03-06 | 1 | -0/+1 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'introduce-pipeline-triggers' into 'master' | Sean McGivern | 2017-03-06 | 25 | -183/+702 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix UserBasicintroduce-pipeline-triggers | Kamil Trzcinski | 2017-03-06 | 1 | -1/+1 |
| | * | | | | | | Rename `/take` to `/take_ownership`, expose `owner` in `v3`. | Kamil Trzcinski | 2017-03-06 | 4 | -7/+8 |
| | * | | | | | | Update after review | Kamil Trzcinski | 2017-03-06 | 3 | -1/+5 |
| | * | | | | | | Lint doc | Kamil Trzcinski | 2017-03-05 | 1 | -2/+2 |
| | * | | | | | | Move foreign key to separate migration | Kamil Trzcinski | 2017-03-05 | 3 | -3/+13 |
| | * | | | | | | Fix import model attributes | Kamil Trzcinski | 2017-03-05 | 2 | -0/+3 |