summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-checkdigitalMoksha2017-11-211-1/+1
|
* use `Gitlab::Routing.url_helpers` instead of ↵digitalMoksha2017-11-211-1/+1
| | | | | | `Rails.application.routes.url_helpers` since `Rails.application.routes.url_helpers` creates a new anonymous module every time it's called
* Optimize read-only middleware so that it does not consume as much CPUStan Hu2017-11-201-0/+6
| | | | | | | | | | | | | In !15082, we changed the behavior of the middleware to call `Rails.application.routes.recognize_path` whenever a new route arrived. However, this can be a CPU-intensive task because Rails needs to allocate memory and compile 850+ different regular expressions, which are complicated in GitLab. As a short-term fix, we can do a lightweight string match before we do the heavier comparison. Closes #40185, gitlab-com/infrastructure#3240
* Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'Nick Thomas2017-11-201-47/+0
|\ | | | | | | | | | | | | remove the rake task `gitlab:sidekiq:drop_post_receive` Closes #40290 See merge request gitlab-org/gitlab-ce!15493
| * remove the rake task `gitlab:sidekiq:drop_post_receive`digitalMoksha2017-11-201-47/+0
| | | | | | | | This task is no longer being used and is not documented.
* | Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix bitbucket wiki import with hashed storage enabled Closes #40292 See merge request gitlab-org/gitlab-ce!15490
| * | Fix bitbucket wiki import with hashed storage enabledNick Thomas2017-11-201-2/+2
| |/
* | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-201-3/+3
| | | | | | | | | | No-one is allowed to force push to a protected branch, or delete it. That's correct in the documentation, but was wrong in the drop-down.
* | Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-202-1/+16
|\ \ | |/ |/| | | | | | | | | Incorporate Gitaly's RefService.DeleteRefs RPC Closes gitaly#740 See merge request gitlab-org/gitlab-ce!15460
| * Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-172-1/+16
| |
* | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-202-3/+17
|\ \ | | | | | | | | | | | | | | | | | | Don't move project repository/attachments when using hashed storage Closes #40289 See merge request gitlab-org/gitlab-ce!15479
| * | Don't move project repository/attachments when using hashed storageBob Van Landuyt2017-11-202-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | When a project is using hashed storage, the repositories and attachments wouldn't be saved on disk using the `full_path`. So the migration would not do anything. However: best to just skip moving when hashed storage is enabled.
* | | Clean up schema of the "merge_requests" tableYorick Peterse2017-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | This adds various foreign keys and indexes to the "merge_requests" table as outlined in https://gitlab.com/gitlab-org/gitlab-ce/issues/31825. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31825
* | | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-201-0/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463
| * | | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts used to take a `Repository` and pass that to `Gitlab::Highlight.highlight`, which would call `#gitattribute` on the repository. Now they use a `Gitlab::Git::Repository`, which didn't have that method defined - but defining it on `Gitlab::Git::Repository` does make it available on `Repository` through `method_missing`, so we can do that and both cases will work.
* | | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-2053-0/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
| * | | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1653-0/+74
| | | | | | | | | | | | | | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* | | | | Fix Gitlab::Git::Repository#remote_tags using unexisting variableAlejandro Rodríguez2017-11-201-2/+2
| |_|/ / |/| | |
* | | | Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master'Robert Speicher2017-11-171-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Restrict update column in batches for large tables See merge request gitlab-org/gitlab-ce!15458
| * | | | Add computed update docs for update_column_in_batchesSean McGivern2017-11-171-0/+9
| | | | |
* | | | | Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-171-1/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove the selects when counting the last page Closes #40266 See merge request gitlab-org/gitlab-ce!15456
| * | | | Remove the selects when counting the last pageBob Van Landuyt2017-11-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last page of the first collection is only loaded into memory when it is being viewed. If it isn't loaded into memory, the `#size` call triggers a count query. This `#count` would generate an invalid query if our custom preloaded counts are included by adding a separate `as count_column` alias on top of the count aliases. Removing the selects in this case will make sure a valid `COUNT(*)` is generated.
* | | | | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-174-97/+146
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708
| * | | | | Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limitsFrancisco Lopez2017-11-172-9/+9
| | | | | |
| * | | | | Changes after rebaseFrancisco Lopez2017-11-172-23/+6
| | | | | |
| * | | | | Removing OffenderFrancisco Lopez2017-11-171-1/+0
| | | | | |
| * | | | | Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-174-30/+31
| | | | | |
| * | | | | Moving exceptions to UserAuthFindersFrancisco Lopez2017-11-173-33/+36
| | | | | |
| * | | | | Leaving atom? query to fix testsFrancisco Lopez2017-11-171-1/+1
| | | | | |
| * | | | | Change the rss url guard clauseFrancisco Lopez2017-11-171-1/+1
| | | | | |
| * | | | | Added some more commentsFrancisco Lopez2017-11-173-14/+13
| | | | | |
| * | | | | Removed method handle_return_valueFrancisco Lopez2017-11-171-13/+8
| | | | | |
| * | | | | Homogenising the type of the request handled by UserAuthFinder. Also tests fixedFrancisco Lopez2017-11-173-13/+11
| | | | | |
| * | | | | Applied some code review commentsFrancisco Lopez2017-11-173-30/+28
| | | | | |
| * | | | | Removing private tokenFrancisco Lopez2017-11-172-7/+16
| | | | | |
| * | | | | Some fixes after rebaseFrancisco Lopez2017-11-173-72/+41
| | | | | |
| * | | | | Updated refactor and pushing to see if test failsFrancisco Lopez2017-11-172-18/+18
| | | | | |
| * | | | | First refactorFrancisco Lopez2017-11-173-82/+115
| | | | | |
| * | | | | Refactor with ActionDispatch::RequestMichael Kozono2017-11-171-13/+11
| | | | | |
| * | | | | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-172-30/+64
| | | | | |
| * | | | | Add request throttlesMichael Kozono2017-11-171-0/+30
| |/ / / /
* | | | | Merge branch ↵Douwe Maan2017-11-171-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-json' into 'master' Resolve "/groups/gitlab-org/labels.json redirects to /groups/gitlab-org/-/labels/.json" Closes #40230 See merge request gitlab-org/gitlab-ce!15427
| * | | | Don't add a trailing slash in group redirects40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-jsonSean McGivern2017-11-161-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we ignored the format, a request to `/groups/foo/labels.json` would redirect to `/groups/foo/-/labels/.json`. But really, it's worse than that, because unless the request contained a trailing slash, we shouldn't add one. Now, we only _keep_ a trailing slash, but don't _add_ one.
* | | | Changing OAuth lookup to be case insensitiveFrancisco Javier López2017-11-172-5/+2
| | | |
* | | | Merge branch 'dm-go-get-blank-enabled-protocol' into 'master'Sean McGivern2017-11-171-3/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix go-import meta data when enabled_git_access_protocol is a blank string Closes #40256 See merge request gitlab-org/gitlab-ce!15448
| * | | Fix go-import meta data when enabled_git_access_protocol is a blank stringDouwe Maan2017-11-171-3/+2
| |/ /
* | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-171-11/+45
| | |
* | | Convert migration to populate latest merge request ID into a background ↵Stan Hu2017-11-171-0/+30
|/ / | | | | | | | | | | | | migration This is to smear updates over a few hours to avoid causing excessive replication lag as seen in https://gitlab.com/gitlab-com/infrastructure/issues/3235.
* | Merge branch 'fix/git-env-repo-paths' into 'master'Douwe Maan2017-11-162-1/+15
|\ \ | | | | | | | | | | | | Use relative git object paths to construct absolute ones before setting Env See merge request gitlab-org/gitlab-ce!15376
| * | Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-pathsAhmad Sherif2017-11-142-1/+15
| |/