summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add specdm-dependency-value-regexDouwe Maan2017-05-261-1/+10
|
* Don't allow spaces in dependency linker value regexDouwe Maan2017-05-252-5/+5
|
* Merge branch '32851-fix-postgres-9-1' into 'master'Douwe Maan2017-05-256-17/+49
|\ | | | | | | | | Resolve "GitLab 9.0 to 9.2 is incompatible with PostgreSQL 9.1" See merge request !11709
| * Only use DROP INDEX CONCURRENTLY on postgreql 9.2+Nick Thomas2017-05-256-17/+49
| |
* | Merge branch 'fix-i18-docs' into 'master'Douwe Maan2017-05-251-1/+11
|\ \ | | | | | | | | | | | | Add small update for the i18n guide. See merge request !11719
| * | Add small update for the i18n guide.fix-i18-docsRuben Davila2017-05-251-1/+11
| | |
* | | Merge branch 'issue_19262' into 'master'Douwe Maan2017-05-253-10/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent commits from upstream repositories to be re-processed by forks Closes #19262 See merge request !11511
| * | | Remove unecessary commit pattern checkFelipe Artur2017-05-252-11/+1
| | | |
| * | | Prevent commits from upstream repositories to be re-processed by forksFelipe Artur2017-05-223-0/+29
| | | |
* | | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-253-3/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide default for calculating label text color Closes #32728 See merge request !11681
| * | | | Provide default for calculating label text color (!11681)winh2017-05-252-3/+6
| | | | |
| * | | | Add failing test for #32728winh2017-05-251-0/+17
| | | | |
* | | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-257-29/+62
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662
| * | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-languageRuben Davila2017-05-257-29/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request.
* | | | | Merge branch ↵Robert Speicher2017-05-251-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32762-gitaly-should-be-recompiled-when-gitaly_server_version-changes' into 'master' Recompile test env Gitaly when `GITALY_SERVER_VERSION` fails Closes #32762 See merge request !11664
| * | | | | Re-download and recompile Gitaly in tests if the version changed32762-gitaly-should-be-recompiled-when-gitaly_server_version-changesAlejandro Rodríguez2017-05-241-1/+12
| | | | | |
* | | | | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into ↵Annabel Dunstone Gray2017-05-252-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note header author and time ago wrapping in parallel diff Closes #32801 See merge request !11702
| * | | | | | Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diffEric Eastwood2017-05-252-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32801
* | | | | | | Merge branch 'dm-more-dependency-linkers' into 'master'Grzegorz Bizon2017-05-2528-63/+1123
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autolink package names in more dependency files See merge request !11226
| * | | | | | | Add regexp_for_value helper methoddm-more-dependency-linkersDouwe Maan2017-05-253-40/+25
| | | | | | | |
| * | | | | | | Cartfile git and binary methods cannot take a GitHub repoDouwe Maan2017-05-251-8/+2
| | | | | | | |
| * | | | | | | Add changelogDouwe Maan2017-05-231-0/+4
| | | | | | | |
| * | | | | | | Autolink package names in requirements.txtDouwe Maan2017-05-234-0/+113
| | | | | | | |
| * | | | | | | Autolink package names in Godeps.jsonDouwe Maan2017-05-234-0/+119
| | | | | | | |
| * | | | | | | Autolink package names in CartfileDouwe Maan2017-05-234-0/+103
| | | | | | | |
| * | | | | | | Autolink package names in podspec.jsonDouwe Maan2017-05-234-0/+137
| | | | | | | |
| * | | | | | | Autolink package names in podspecDouwe Maan2017-05-234-0/+102
| | | | | | | |
| * | | | | | | Autolink package names in PodfileDouwe Maan2017-05-235-0/+87
| | | | | | | |
| * | | | | | | Autolink package names in composer.jsonDouwe Maan2017-05-234-0/+109
| | | | | | | |
| * | | | | | | Autolink package names in package.jsonDouwe Maan2017-05-236-0/+205
| | | | | | | |
| * | | | | | | Autolink package names in gemspecDouwe Maan2017-05-234-1/+94
| | | | | | | |
| * | | | | | | Refactor DependencyLinker::BaseLinkerDouwe Maan2017-05-235-62/+71
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-05-252-1/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtered search issuable empty state exception Closes #31455 See merge request !11347
| * | | | | | | Remove shared example and improve sub_group_issuables_spec.rbfix-filtered-search-issuable-empty-state-exceptionLuke "Jared" Bennett2017-05-252-22/+17
| | | | | | | |
| * | | | | | | Remove 'should' from scenario in has_subgroup_title_spec.rbLuke "Jared" Bennett2017-05-251-1/+1
| | | | | | | |
| * | | | | | | Added specs to test for subgroup titles on issue and mr pagesLuke "Jared" Bennett2017-05-122-0/+37
| | | | | | | |
| * | | | | | | Check for filtered-search before constructing filteredsearchmanagerLuke "Jared" Bennett2017-05-121-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'add-back-margin-to-note-text' into 'master'Annabel Dunstone Gray2017-05-251-6/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 0 margin bottom for last paragraph on note text See merge request !11699
| * | | | | | | | Remove 0 margin bottom for last paragraph on note textadd-back-margin-to-note-texttauriedavis2017-05-241-6/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-2532-788/+804
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor `DynamicPathValidator` and `GitLab::Regex` some more See merge request !11693
| * | | | | | | | | Remove extra spacerevert-b0498c17Douwe Maan2017-05-241-1/+1
| | | | | | | | | |
| * | | | | | | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-2432-788/+804
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5
* | | | | | | | | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-255-15/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix terminals support for Kubernetes service Closes #31754 See merge request !11653
| * | | | | | | | | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-255-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was broken, because we introduced a default namespace, which was not used by terminal methods.
* | | | | | | | | | | Merge branch 'grpc-1.3.4' into 'master'Douwe Maan2017-05-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use grpc 1.3.4 See merge request !11645
| * | | | | | | | | | | Use grpc 1.3.4Jacob Vosmaer2017-05-231-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-2548-289/+880
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Web Hooks calls logging Closes #17848 See merge request !11027
| * | | | | | | | | | | | Implement web hooks loggingAlexander Randa2017-05-2548-289/+880
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * implemented logging of project and system web hooks * implemented UI for user area (project hooks) * implemented UI for admin area (system hooks) * implemented retry of logged webhook * NOT imeplemented log remover
* | | | | | | | | | | | | Merge branch 'zj-faster-image-trigger-builds' into 'master'Marin Jankovski2017-05-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use smaller image when triggering a build See merge request !11674
| * | | | | | | | | | | | Use smaller image when triggering a buildzj-faster-image-trigger-buildsZ.J. van de Weg2017-05-241-0/+1
| | | | | | | | | | | | |