Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rework performance section to allow for string freezingsh-freeze-strings-doc | Stan Hu | 2018-08-01 | 1 | -23/+31 |
| | | | | Realtes to #47424 | ||||
* | Add I8N strings for Bitbucket Server importer | Stan Hu | 2018-08-01 | 1 | -0/+9 |
| | |||||
* | Fix selection of existing project key by default | Stan Hu | 2018-08-01 | 2 | -6/+17 |
| | |||||
* | Assorted Bitbucket Server importer code cleanup based on review | Stan Hu | 2018-08-01 | 4 | -11/+8 |
| | |||||
* | Fix handling of non-existent groups | Stan Hu | 2018-08-01 | 1 | -3/+3 |
| | |||||
* | Improve localization and formatting of Bitbucket Server importer status page | Stan Hu | 2018-08-01 | 1 | -9/+10 |
| | |||||
* | Remove extra space in app/controllers/import/bitbucket_server_controller.rb | Stan Hu | 2018-08-01 | 1 | -1/+1 |
| | |||||
* | Inline repo_owner in app/controllers/import/bitbucket_server_controller.rb | Stan Hu | 2018-08-01 | 1 | -3/+1 |
| | |||||
* | Properly fallback to current user in namespaces helper | Stan Hu | 2018-07-31 | 1 | -0/+2 |
| | |||||
* | Fix failing spec in ./spec/features/projects/new_project_spec.rb | Stan Hu | 2018-07-31 | 1 | -8/+10 |
| | |||||
* | Deal with subpaths and trailing slashes properly | Stan Hu | 2018-07-31 | 2 | -7/+25 |
| | |||||
* | Revert "Remove unnecessary lookup for merge request SHAs" | Stan Hu | 2018-07-31 | 1 | -2/+7 |
| | | | | This reverts commit a9d359b48463c2a77529b9a5f289f9d1abf45484. | ||||
* | Fix failing spec in fallback diff note change | Stan Hu | 2018-07-31 | 2 | -5/+2 |
| | |||||
* | Merge branch 'master' into sh-support-bitbucket-server-import | Stan Hu | 2018-07-31 | 7 | -8/+18 |
|\ | |||||
| * | Merge branch 'winh-lint-console-tests' into 'master' | Mike Greiling | 2018-07-31 | 4 | -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-tests | Winnie Hellmann | 2018-07-24 | 4 | -4/+4 |
| | | | |||||
| * | | Merge branch 'sh-lfs-fix-content-type' into 'master' | Nick Thomas | 2018-07-31 | 3 | -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.0 | Stan Hu | 2018-07-31 | 3 | -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 note | Stan Hu | 2018-07-31 | 1 | -1/+6 |
| | | | | |||||
* | | | | Remove unnecessary lookup for merge request SHAs | Stan Hu | 2018-07-31 | 1 | -7/+2 |
| | | | | |||||
* | | | | Fix bug where fallback diff notes would not have an associated position | Stan Hu | 2018-07-31 | 2 | -7/+17 |
| | | | | |||||
* | | | | Handle empty description field | Stan Hu | 2018-07-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use URI.join to avoid slash headaches | Stan Hu | 2018-07-31 | 1 | -3/+3 |
| | | | | |||||
* | | | | Hide error details if there are none | Stan Hu | 2018-07-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Convert Bitbucket field to password field | Stan Hu | 2018-07-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Default to importing to the current project key | Stan Hu | 2018-07-31 | 3 | -5/+29 |
| | | | | |||||
* | | | | Fix namespaces_helper reporting multiple groups | Stan Hu | 2018-07-31 | 2 | -2/+14 |
| | | | | |||||
* | | | | Give some context on threaded discussions | Stan Hu | 2018-07-31 | 2 | -7/+21 |
| | | | | |||||
* | | | | Track parental relationships in comments | Stan Hu | 2018-07-31 | 2 | -7/+55 |
| | | | | |||||
* | | | | Fix Rubocop complaint about update_attributes | Stan Hu | 2018-07-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into sh-support-bitbucket-server-import | Stan Hu | 2018-07-31 | 163 | -692/+2863 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'revert-c90d7633' into 'master' | Rémy Coutable | 2018-07-31 | 34 | -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 Cabrera | 2018-07-31 | 34 | -534/+178 |
| | | | | | | | | | | | | | | | This reverts merge request !20801 | ||||
| * | | | | Merge branch 'fj-37736-improve-performance-post-receive-cleaning-code' into ↵ | Nick Thomas | 2018-07-31 | 4 | -44/+59 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Code cleaning in PostReceive services See merge request gitlab-org/gitlab-ce!20916 | ||||
| | * | | | | Code cleaning in PostReceive services | Francisco Javier López 🌴 (About to) On vacation; back on August 22th! | 2018-07-31 | 4 | -44/+59 |
| |/ / / / | |||||
| * | | | | Merge branch 'zj-remove-git-rake-tasks' into 'master' | Sean McGivern | 2018-07-31 | 7 | -165/+22 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | Remove git rake tasks Closes #41699 and gitaly#768 See merge request gitlab-org/gitlab-ce!20806 | ||||
| | * | | | Remove gitlab:user:check_repos task | Zeger-Jan van de Weg | 2018-07-31 | 4 | -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 version | Zeger-Jan van de Weg | 2018-07-31 | 1 | -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 tasks | Zeger-Jan van de Weg | 2018-07-31 | 5 | -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 McGivern | 2018-07-31 | 27 | -7/+768 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Delete todos when users loses target read permissions See merge request gitlab-org/gitlab-ce!20665 | ||||
| | * | | | Remove todos when project feature visibility changes | Jarka Kadlecová | 2018-07-31 | 10 | -40/+286 |
| | | | | | |||||
| | * | | | Fix removing todos for confidential issues | Jarka Kadlecová | 2018-07-30 | 4 | -7/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - dont remove todos for authos & assignees - remove todos for project guests | ||||
| | * | | | Delete todos when users loses target read permissions | Jarka Kadlecová | 2018-07-30 | 23 | -7/+473 |
| | | | | | |||||
| * | | | | Merge branch 'fix-storage-size-for-artifacts-change' into 'master' | Kamil Trzciński | 2018-07-31 | 3 | -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 artifacts | Peter Marko | 2018-07-27 | 3 | -3/+31 |
| | | | | | | |||||
| * | | | | | Merge branch 'ce-application-settings' into 'master' | Sean McGivern | 2018-07-31 | 3 | -102/+102 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE application settings (not Docs) Cleanup See merge request gitlab-org/gitlab-ce!20723 | ||||
| | * | | | | | Updated application settings with minor fixes | Marcel Amirault | 2018-07-30 | 3 | -102/+102 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'feature/gb/login-activity-metrics' into 'master' | Sean McGivern | 2018-07-31 | 14 | -76/+499 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user authentication activity metrics Closes #47789 See merge request gitlab-org/gitlab-ce!20668 | ||||
| | * | | | | | | Add changelog for authentication activity metrics | Grzegorz Bizon | 2018-07-31 | 1 | -0/+5 |
| | | | | | | | | |||||
| | * | | | | | | Improve authentication activity code readability | Grzegorz Bizon | 2018-07-31 | 4 | -14/+17 |
| | | | | | | | |