summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rework performance section to allow for string freezingsh-freeze-strings-docStan Hu2018-08-011-23/+31
| | | | Realtes to #47424
* Add I8N strings for Bitbucket Server importerStan Hu2018-08-011-0/+9
|
* Fix selection of existing project key by defaultStan Hu2018-08-012-6/+17
|
* Assorted Bitbucket Server importer code cleanup based on reviewStan Hu2018-08-014-11/+8
|
* Fix handling of non-existent groupsStan Hu2018-08-011-3/+3
|
* Improve localization and formatting of Bitbucket Server importer status pageStan Hu2018-08-011-9/+10
|
* Remove extra space in app/controllers/import/bitbucket_server_controller.rbStan Hu2018-08-011-1/+1
|
* Inline repo_owner in app/controllers/import/bitbucket_server_controller.rbStan Hu2018-08-011-3/+1
|
* Properly fallback to current user in namespaces helperStan Hu2018-07-311-0/+2
|
* Fix failing spec in ./spec/features/projects/new_project_spec.rbStan Hu2018-07-311-8/+10
|
* Deal with subpaths and trailing slashes properlyStan Hu2018-07-312-7/+25
|
* Revert "Remove unnecessary lookup for merge request SHAs"Stan Hu2018-07-311-2/+7
| | | | This reverts commit a9d359b48463c2a77529b9a5f289f9d1abf45484.
* Fix failing spec in fallback diff note changeStan Hu2018-07-312-5/+2
|
* Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-317-8/+18
|\
| * Merge branch 'winh-lint-console-tests' into 'master'Mike Greiling2018-07-314-4/+4
| |\ | | | | | | | | | | | | Enable no-console ESLint rule for tests See merge request gitlab-org/gitlab-ce!20812
| | * Enable no-console ESLint rule for testswinh-lint-console-testsWinnie Hellmann2018-07-244-4/+4
| | |
| * | Merge branch 'sh-lfs-fix-content-type' into 'master'Nick Thomas2018-07-313-4/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix LFS uploads not working with git-lfs 2.5.0 Closes #49752 See merge request gitlab-org/gitlab-ce!20923
| | * | Fix LFS uploads not working with git-lfs 2.5.0Stan Hu2018-07-313-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-lfs 2.5.0 now sets the Content-Type header instead of hard-coding it to application/octet-stream: https://github.com/git-lfs/git-lfs/pull/3137 To avoid this issue, we explicitly tell the client to use application/octet-stream. Closes #49752
* | | | Improve formatting of fallback diff noteStan Hu2018-07-311-1/+6
| | | |
* | | | Remove unnecessary lookup for merge request SHAsStan Hu2018-07-311-7/+2
| | | |
* | | | Fix bug where fallback diff notes would not have an associated positionStan Hu2018-07-312-7/+17
| | | |
* | | | Handle empty description fieldStan Hu2018-07-311-1/+1
| | | |
* | | | Use URI.join to avoid slash headachesStan Hu2018-07-311-3/+3
| | | |
* | | | Hide error details if there are noneStan Hu2018-07-311-1/+1
| | | |
* | | | Convert Bitbucket field to password fieldStan Hu2018-07-311-1/+1
| | | |
* | | | Default to importing to the current project keyStan Hu2018-07-313-5/+29
| | | |
* | | | Fix namespaces_helper reporting multiple groupsStan Hu2018-07-312-2/+14
| | | |
* | | | Give some context on threaded discussionsStan Hu2018-07-312-7/+21
| | | |
* | | | Track parental relationships in commentsStan Hu2018-07-312-7/+55
| | | |
* | | | Fix Rubocop complaint about update_attributesStan Hu2018-07-311-1/+1
| | | |
* | | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-31163-692/+2863
|\ \ \ \ | |/ / /
| * | | Merge branch 'revert-c90d7633' into 'master'Rémy Coutable2018-07-3134-534/+178
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'" See merge request gitlab-org/gitlab-ce!20925
| | * | | Revert "Merge branch '48098-mutual-auth-cluster-applications' into 'master'"Mayra Cabrera2018-07-3134-534/+178
| | | | | | | | | | | | | | | This reverts merge request !20801
| * | | | Merge branch 'fj-37736-improve-performance-post-receive-cleaning-code' into ↵Nick Thomas2018-07-314-44/+59
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Code cleaning in PostReceive services See merge request gitlab-org/gitlab-ce!20916
| | * | | | Code cleaning in PostReceive servicesFrancisco Javier López 🌴 (About to) On vacation; back on August 22th!2018-07-314-44/+59
| |/ / / /
| * | | | Merge branch 'zj-remove-git-rake-tasks' into 'master'Sean McGivern2018-07-317-165/+22
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Remove git rake tasks Closes #41699 and gitaly#768 See merge request gitlab-org/gitlab-ce!20806
| | * | | Remove gitlab:user:check_repos taskZeger-Jan van de Weg2018-07-314-47/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While reviewing this branch it was noted that this task was broken. Given the limited value this task brings, and given the fact that much of the old behaviour has been moved to be automatically fixed, removing was a good option. Suggestion in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20806#note_91261001
| | * | | Bump Gitaly versionZeger-Jan van de Weg2018-07-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This branch includes changes that removes a rake taks that cleans up config.lock files. This change bumps Gitaly so it happens automatically so users don't have to bother.
| | * | | Remove git rake tasksZeger-Jan van de Weg2018-07-315-118/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tasks are happening through housekeeping right now, by default ever 10th push. This removes the need for these tasks. Side note, this removes one of my first contributions to GitLab, as back than I introduced these tasks through: 54e6c0045bb13c05cc5478cbdf47d3246bd9fe2b Closes https://gitlab.com/gitlab-org/gitaly/issues/768
| * | | | Merge branch 'todos-visibility-change' into 'master'Sean McGivern2018-07-3127-7/+768
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Delete todos when users loses target read permissions See merge request gitlab-org/gitlab-ce!20665
| | * | | Remove todos when project feature visibility changesJarka Kadlecová2018-07-3110-40/+286
| | | | |
| | * | | Fix removing todos for confidential issuesJarka Kadlecová2018-07-304-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | - dont remove todos for authos & assignees - remove todos for project guests
| | * | | Delete todos when users loses target read permissionsJarka Kadlecová2018-07-3023-7/+473
| | | | |
| * | | | Merge branch 'fix-storage-size-for-artifacts-change' into 'master'Kamil Trzciński2018-07-313-3/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update total storage size when changing size of artifacts See merge request gitlab-org/gitlab-ce!20697
| | * | | | Update total storage size when changing size of artifactsPeter Marko2018-07-273-3/+31
| | | | | |
| * | | | | Merge branch 'ce-application-settings' into 'master'Sean McGivern2018-07-313-102/+102
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE application settings (not Docs) Cleanup See merge request gitlab-org/gitlab-ce!20723
| | * | | | | Updated application settings with minor fixesMarcel Amirault2018-07-303-102/+102
| | | | | | |
| * | | | | | Merge branch 'feature/gb/login-activity-metrics' into 'master'Sean McGivern2018-07-3114-76/+499
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user authentication activity metrics Closes #47789 See merge request gitlab-org/gitlab-ce!20668
| | * | | | | | Add changelog for authentication activity metricsGrzegorz Bizon2018-07-311-0/+5
| | | | | | | |
| | * | | | | | Improve authentication activity code readabilityGrzegorz Bizon2018-07-314-14/+17
| | | | | | | |