summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Avoid using Rugged in Gitlab::Git::Wiki#preview_slugfix/avoid-using-rugged-in-wiki-preview-slugAhmad Sherif2017-10-261-1/+9
|
* Merge branch 'patch-30' into 'master'Douwe Maan2017-10-261-4/+7
|\ | | | | | | | | Clarify the language around External Group membership with SAML SSO to clarify… See merge request gitlab-org/gitlab-ce!15042
| * Clarify the language around External Group membership with SAML SSO to ↵Andrew Davis2017-10-261-4/+7
| | | | | | | | clarify that this will NOT add users to GitLab Groups.
* | Merge branch 'an/local_branches_opt_out' into 'master'Douwe Maan2017-10-261-1/+1
|\ \ | | | | | | | | | | | | Make local_branches OPT_OUT See merge request gitlab-org/gitlab-ce!15045
| * | Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
| |/
* | Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'Sean McGivern2017-10-263-4/+14
|\ \ | | | | | | | | | | | | | | | | | | Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019
| * | Add path attribute to WikiFile classAhmad Sherif2017-10-263-4/+14
| |/ | | | | | | Fixes #39420
* | Merge branch 'gl-username-hook-fix' into 'master'Douwe Maan2017-10-262-14/+16
|\ \ | | | | | | | | | | | | Fix the incorrect value being used to set GL_USERNAME on hooks See merge request gitlab-org/gitlab-ce!15038
| * | Fix the incorrect value being used to set GL_USERNAME on hooksgl-username-hook-fixAlejandro Rodríguez2017-10-252-14/+16
| |/
* | Merge branch 'non-existing-repo-optimization' into 'master'Douwe Maan2017-10-262-8/+35
|\ \ | | | | | | | | | | | | Avoid calling underlying methods on non-existing repos See merge request gitlab-org/gitlab-ce!14962
| * | Avoid calling underlying methods on non-existing reposnon-existing-repo-optimizationAlejandro Rodríguez2017-10-202-8/+35
| | | | | | | | | | | | This saves us Rugged/gRPC invocations
* | | Merge branch 'api-configure-jira' into 'master'Douwe Maan2017-10-267-4/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Validate username/pw for Jiraservice, require them in the API Closes #36621 See merge request gitlab-org/gitlab-ce!15025
| * | | Update factories for git push serviceapi-configure-jiraRobert Schilling2017-10-241-0/+2
| | | |
| * | | Factories need to set required attributesRobert Schilling2017-10-241-0/+2
| | | |
| * | | Update API docsRobert Schilling2017-10-242-3/+3
| | | |
| * | | Validate username/pw for Jiraservice, require them in the APIRobert Schilling2017-10-244-2/+23
| | | |
* | | | Merge branch 'feature/ssh_host_fingerprint' into 'master'Sean McGivern2017-10-2616-4/+411
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Automatic configuration settings page Closes #25142 See merge request gitlab-org/gitlab-ce!13850
| * | | Added ssh fingerprint, gitlab ci and pages information in an instance ↵Francisco Lopez2017-10-2516-4/+411
|/ / / | | | | | | | | | | | | | | | configuration page Closes #25142
* | | Merge branch '38178-fl-mr-notes-components' into 'master'Phil Hughes2017-10-2510-39/+94
|\ \ \ | | | | | | | | | | | | | | | | Moves placeholders components into shared folder with documentation. See merge request gitlab-org/gitlab-ce!14964
| * | | Moves placeholders components into shared folder with documentation. Makes ↵38178-fl-mr-notes-componentsFilipa Lacerda2017-10-1910-39/+94
| | |/ | |/| | | | | | | them easier to reuse in MR and Snippets comments
* | | Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-254-18/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move all rugged operation for ff_merge inside Gitlab::Git Closes gitaly#683 See merge request gitlab-org/gitlab-ce!15011
| * | | Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-244-18/+68
| |/ / | | | | | | | | | We also delete some unused code related to the aforementioned feature.
* | | Merge branch '35199-case-insensitive-branches-search' into 'master'Sean McGivern2017-10-253-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add case insensitive branches search Closes #35199 See merge request gitlab-org/gitlab-ce!14995
| * | | Add case insensitive branches searchGeorge Andrinopoulos2017-10-233-1/+15
| | | |
* | | | Merge branch '39419-remove-overzealous-tooltips-in-projects-page-tabs' into ↵Sean McGivern2017-10-252-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Remove overzealous tooltips in projects page tabs" Closes #39419 See merge request gitlab-org/gitlab-ce!15017
| * | | | Resolve "Remove overzealous tooltips in projects page tabs"Victor Wu2017-10-252-3/+8
|/ / / /
* | | | Merge branch '32318-filter-icon' into 'master'Phil Hughes2017-10-253-13/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove filter icon from search bar Closes #32318 See merge request gitlab-org/gitlab-ce!14966
| * | | | Remove filter icon from search bar32318-filter-iconAnnabel Dunstone Gray2017-10-243-13/+6
|/ / / /
* | | | Merge branch 'jramsay-remove-superfluous-namespace' into 'master'Douwe Maan2017-10-242-11/+68
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove superfluous namespace from cluster settings See merge request gitlab-org/gitlab-ce!14987
| * | | | Remove superfluous namespace from cluster settingsjramsay-remove-superfluous-namespaceJames Ramsay2017-10-222-11/+68
| | | | |
* | | | | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-248-37/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support `Gitaly::User`'s gl_username field See merge request gitlab-org/gitlab-ce!15016
| * | | | | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-238-37/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We also unify conversions from and to `Gitaly::User`s in the `Gitlab::Git::User` class.
* | | | | | Merge branch 'bvl-dont-rename-free-names' into 'master'Douwe Maan2017-10-242-11/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't rename groups/projects that aren't reserved anymore Closes #39387 See merge request gitlab-org/gitlab-ce!15029
| * | | | | | Don't rename groups/projects that aren't reserved anymorebvl-dont-rename-free-namesBob Van Landuyt2017-10-242-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12932 we freed up some names. But we were still renaming them.
* | | | | | | Merge branch 'sh-memoize-logger' into 'master'Nick Thomas2017-10-243-2/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize GitLab logger to reduce open file descriptors Closes gitlab-ee#3664 See merge request gitlab-org/gitlab-ce!15007
| * | | | | | | Memoize GitLab logger to reduce open file descriptorsStan Hu2017-10-243-2/+27
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We see that in gitlab-org/gitlab-ee#3664 that if we log a lot of data in Sidekiq workers, the number of open file descriptors reaches over 1000. To avoid this, we can memoize the logger per thread via RequestStore. Closes gitlab-org/gitlab-ee#3664
* | | | | | | Merge branch 'suggest-rename-origin' into 'master'Sean McGivern2017-10-242-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest to rename the remote for existing repositories See merge request gitlab-org/gitlab-ce!14970
| * | | | | | | Add changelog entryHerman van Rink2017-10-201-0/+5
| | | | | | | |
| * | | | | | | Suggest to rename the remote for existing repositoriesHerman van Rink2017-10-201-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'api-doc-group-statistics' into 'master'Achilleas Pipinellis2017-10-242-0/+37
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update groups API documentation Closes #38922 See merge request gitlab-org/gitlab-ce!15024
| * | | | | | | | Update groups API documentationRobert Schilling2017-10-242-0/+37
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-environment-write-ref' into 'master'Grzegorz Bizon2017-10-243-1/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the writing of invalid environment refs Closes #39182 See merge request gitlab-org/gitlab-ce!14993
| * | | | | | | | Fix the writing of invalid environment refssh-fix-environment-write-refStan Hu2017-10-233-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment names that contained a space would cause an error in GitLab 10.1 because a new guard clause was introduced in Repository#write_ref to prevent such references from existing. Use the slug instead to ensure that the name is valid. Closes #39182
* | | | | | | | | Merge branch '23000-pages-api' into 'master'Grzegorz Bizon2017-10-2410-4/+782
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pages API" Closes #23000 See merge request gitlab-org/gitlab-ce!13917
| * | | | | | | | | Add pages domains API implementationTravis Miller2017-10-223-0/+122
| | | | | | | | | |
| * | | | | | | | | Add pages domains API entitiesTravis Miller2017-10-221-0/+17
| | | | | | | | | |
| * | | | | | | | | Add pages domains API testsTravis Miller2017-10-221-0/+440
| | | | | | | | | |
| * | | | | | | | | Add pages domains API schemaTravis Miller2017-10-221-0/+23
| | | | | | | | | |
| * | | | | | | | | Add pages domains API documentationTravis Miller2017-10-222-0/+171
| | | | | | | | | |
| * | | | | | | | | Rename conflicting private method in PagesDomain modelTravis Miller2017-10-221-4/+4
| | | | | | | | | |
View Lorry Controller Status