summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit only renames the commits, the cascading effects will be dealt with later.
| * | | | | | | Rename Builds to Jobs in the APIZ.J. van de Weg2017-03-067-69/+827
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#28515 [ci skip]
* | | | | | | | Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into ↵Sean McGivern2017-03-0622-20/+368
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' GitLab should have an option to prevent users from signing in from multiple IPs Closes #27520 See merge request !8998
| * | | | | | | 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 ↵Pawel Chojnacki2017-03-063-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mutable constants and empty error classes
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + rename shared context
| * | | | | | | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵Pawel Chojnacki2017-03-0615-86/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review - cleanup formating in haml - clarify time window is in seconds - cleanup straneous chunks in db/schema - rename count_uniqe_ips to update_and_return_ips_count - other
| * | | | | | | 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 file See merge request !9282
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues mentioned but not closed for JIRA Closes #26028 See merge request !9687
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ReferenceExtractor` would return an array of `ExternalIssue` objects, and then perform `Array#-` to remove the issues closed. `ExternalIssue`s had `==` defined, but not `hash` or `eql?`, which are used by `Array#-`.
* | | | | | | | | Merge branch 'workhorse-1.4.0' into 'master' Sean McGivern2017-03-062-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 1.4.0 See merge request !9724
| * | | | | | | | | Use gitlab-workhorse 1.4.0Jacob Vosmaer2017-03-062-1/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fixes, Gitaly gRPC support, experimental Redis integration.
* | | | | | | | | 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 height Closes #28704 See merge request !9667
| * | | | | | | | | 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 IssuableFinder performance Closes #25503 See merge request !9030
| * | | | | | | | | | Improve issues filtering performanceJarka Kadlecova2017-03-064-14/+35
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'second-nav-spacing-mobile' into 'master' Annabel Dunstone Gray2017-03-062-10/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spacing in mobile secondary nav See merge request !9657
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the spacing was spread evenly across the width which lead to some weird spacing issues, more noticeable between the user avatar & the dropdown caret
* | | | | | | | | | | Merge branch 'api-drop-subscribed' into 'master' Sean McGivern2017-03-0624-36/+451
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "subscribed" field from API responses returning list of issues or merge requests Closes #22374 See merge request !9661
| * | | | | | | | | | | Remove "subscribed" field from API responses returning list of issues or ↵api-drop-subscribedAdam Niedzielski2017-03-0621-32/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge requests
| * | | | | | | | | | | 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 dependency Closes gitaly#109 See merge request !9722
| * | | | | | | | | | Add gitaly server dependencyJacob Vosmaer2017-03-061-0/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GitLab 9.0.0 we want to turn on Gitaly in Omnibus installations. Gitaly is not a required component yet for source installations because we want to iterate on the configuration and architecture some more. Omnibus installations will have the option to completely disable Gitaly if they want to or if necessary. The new GITALY_SERVER_VERSION file which version of the Gitaly server application is needed by the current GitLab version.
* | | | | | | | | | Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-0625-183/+702
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline triggers API See merge request !9713
| * | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | Update documentation and expose IDKamil Trzcinski2017-03-054-109/+172
| | | | | | | | | | |
| * | | | | | | | | | Introduce tests for pipeline triggersKamil Trzcinski2017-03-056-52/+145
| | | | | | | | | | |
| * | | | | | | | | | Fix trigger modelKamil Trzcinski2017-03-051-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Update db/schemaKamil Trzcinski2017-03-053-3/+6
| | | | | | | | | | |
| * | | | | | | | | | Make triggers to be user awareKamil Trzcinski2017-03-056-7/+31
| | | | | | | | | | |
| * | | | | | | | | | Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-053-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - they can have owner, - they can be edited, - they have description, - you can take ownership of them
| * | | | | | | | | | Update triggers APIKamil Trzcinski2017-03-055-17/+311
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-0611-57/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove remnants of git annex See merge request !9508
View Lorry Controller Status