summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Pass tag SHA to post-receive hook when tag is created via UI24813-project-members-with-developer-access-can-no-longer-create-tagsAdam Niedzielski2016-11-284-4/+37
* Revert "Pass correct tag target to post-receive hook when creating tag via UI"Adam Niedzielski2016-11-282-32/+3
* Merge branch 'rs-project-security-spec-speed' into 'master' Rémy Coutable2016-11-284-765/+747
|\
| * Speed up Project security access specsRobert Speicher2016-11-284-765/+747
* | Merge branch 'fix-dead-help-link' into 'master' Rémy Coutable2016-11-283-14/+30
|\ \
| * | Check that both '/help' and '/help/' URLs have the same behaviourDavid Wagner2016-11-251-0/+24
| * | Fix broken external links in help/index.htmlDavid Wagner2016-11-202-14/+6
* | | Merge branch 'remove-relative-call-from-finder' into 'master' Rémy Coutable2016-11-281-2/+0
|\ \ \
| * | | Remove unnecessary require_relative calls from finderSemyon Pupkov2016-11-261-2/+0
* | | | Merge branch '22253-move-lfshelper-methods-somewhere-else-than-app-helpers' i...Robert Speicher2016-11-286-54/+91
|\ \ \ \
| * | | | Move LfsHelper to a new LfsRequest concern22253-move-lfshelper-methods-somewhere-else-than-app-helpersRémy Coutable2016-11-236-54/+91
* | | | | Merge branch 'backport/groups-helper-refactor' into 'master' Douwe Maan2016-11-281-5/+1
|\ \ \ \ \
| * | | | | Backporting little groups_helper refactor from gitlab-org/gitlab-ee!904backport/groups-helper-refactorGabriel Mazetto2016-11-261-5/+1
* | | | | | Merge branch 'refresh-authorizations-with-lease' into 'master' Douwe Maan2016-11-2810-48/+84
|\ \ \ \ \ \
| * | | | | | Refresh project authorizations using a Redis leaserefresh-authorizations-with-leaseYorick Peterse2016-11-2510-48/+84
* | | | | | | Merge branch 'events-cache-invalidation' into 'master' Douwe Maan2016-11-2820-132/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Removed data-user-is view codeevents-cache-invalidationYorick Peterse2016-11-256-33/+25
| * | | | | | Remove event caching codeYorick Peterse2016-11-2315-99/+13
* | | | | | | Merge branch 'ux-guide-anchor-hover' into 'master' Achilleas Pipinellis2016-11-272-13/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | [ci skip] UX Guide: Anchor hover guidance include color changeux-guide-anchor-hoverawhildy2016-11-262-13/+5
|/ / / / / /
* | | | | | Merge branch 'ux-guide-dropdown-max-height' into 'master' Achilleas Pipinellis2016-11-261-0/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [ci skip] UX Guide: add guidance for max height for dropdownsux-guide-dropdown-max-heightawhildy2016-11-251-0/+2
|/ / / / /
* | | | | Merge branch 'workhorse-v1.0.1' into 'master' Rémy Coutable2016-11-254-3/+7
|\ \ \ \ \
| * | | | | Update GitLab Workhorse to v1.0.1Nick Thomas2016-11-254-3/+7
* | | | | | Merge branch '24903-allow-groups-with-special-characters' into 'master' Alfredo Sumaran2016-11-251-2/+3
|\ \ \ \ \ \
| * | | | | | use standard gitlab namespace regex for group name validationMike Greiling2016-11-251-2/+3
| * | | | | | allow "." in group name validation regex24903-allow-groups-with-special-charactersMike Greiling2016-11-231-1/+1
* | | | | | | Merge branch 'zj-expose-coverage-pipelines' into 'master' Rémy Coutable2016-11-254-6/+29
|\ \ \ \ \ \ \
| * | | | | | | Add docs for pipeline coverageZ.J. van de Weg2016-11-251-6/+12
| * | | | | | | Expose coverage on GET pipelines/:idzj-expose-coverage-pipelinesZ.J. van de Weg2016-11-253-0/+17
* | | | | | | | Merge branch 'timeout-merge-request-for-binary-file' into 'master' Yorick Peterse2016-11-254-3/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix: Timeout creating and viewing merge request for binary filetimeout-merge-request-for-binary-fileValery Sizov2016-11-254-3/+21
* | | | | | | | | Merge branch 'issue-24534' into 'master' Rémy Coutable2016-11-2515-158/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unnecessary sentences for status codes in the API documentationLuis Alonso Chavez Armendariz2016-11-2415-158/+48
* | | | | | | | | | Merge branch 'zj-slash-commands-improvements' into 'master' 24769-make-mattermost-command-easier-to-configureKamil Trzciński2016-11-252-1/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Accept a valid ref for issue showZ.J. van de Weg2016-11-252-1/+9
* | | | | | | | | | Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master' Yorick Peterse2016-11-258-12/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | API: Introduce `#find_group!` which also check access permission22373-reduce-queries-in-api-helpers-find_projectRémy Coutable2016-11-244-7/+15
| * | | | | | | | | | API: Introduce `#find_project!` which also check access permissionRémy Coutable2016-11-242-8/+11
| * | | | | | | | | | API: Use `#find_project` in API::Triggers and API::ServicesRémy Coutable2016-11-242-2/+2
| * | | | | | | | | | Make API::Helpers find a project with only one queryRémy Coutable2016-11-242-1/+10
* | | | | | | | | | | Merge branch 'fix-cancelling-pipelines' into 'master' Kamil Trzciński2016-11-258-10/+288
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Wrap against 80 chars and rename failed_or_canceledfix-cancelling-pipelinesLin Jen-Shin2016-11-231-7/+9
| * | | | | | | | | | | Expand the loop and reduce overlapped conditionsLin Jen-Shin2016-11-221-12/+30
| * | | | | | | | | | | Passing a user to retry_failed in testsLin Jen-Shin2016-11-221-3/+3
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-22167-1152/+4241
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Test against all possible cases, feedback:Lin Jen-Shin2016-11-221-14/+17
| * | | | | | | | | | | | Test against all types and more status:Lin Jen-Shin2016-11-211-37/+45
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix-cancelling-pipelinesLin Jen-Shin2016-11-21305-1386/+7560
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Prefer a description for it and split the case:Lin Jen-Shin2016-11-212-32/+51