summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'request-store-wrap' into 'master'Rémy Coutable2017-07-182-17/+4
|\ | | | | | | | | Add RequestCache to cache via RequestStore See merge request !12920
| * Rename the methods to make it fit with current nameLin Jen-Shin2017-07-181-1/+1
| |
| * Follow feedback on the merge requestLin Jen-Shin2017-07-181-1/+1
| |
| * Cache Note#notable for commits and fix testsrequest-store-wrapLin Jen-Shin2017-07-181-1/+1
| |
| * Use RequestStoreWrap for Commit#authorLin Jen-Shin2017-07-181-16/+3
| | | | | | | | | | | | | | We also try to use instance variable to cache the result if RequestStore is not available, so we could keep the same logic, using the same cache key. Also introduce a way to specify method specific cache key
* | Renamed Gitaly servicesAndrew Newdigate2017-07-181-2/+2
|/
* Promote visibility level helpers from Group to NamespaceNick Thomas2017-07-172-5/+5
| | | | | In EE, we make use of `namespace#public?` in projects. When the project is in a personal namespace, this breaks as the `public?` helper isn't present.
* Merge branch ↵Sean McGivern2017-07-141-1/+1
|\ | | | | | | | | | | | | 'fix-exact-matches-of-username-and-email-on-top-of-the-user-search' into 'master' Fixes the user order being overriden in the autocomplete controller See merge request !12868
| * Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-141-1/+1
| |
* | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' ↵Sean McGivern2017-07-141-3/+5
|\ \ | |/ |/| | | | | | | | | | | | | into 'master' Recover from renaming project that has container images Closes #23019 See merge request !12840
| * Implement memoization in project correctly this timefix/gb/recover-from-renaming-project-with-container-imagesGrzegorz Bizon2017-07-141-1/+3
| |
| * Memoize result of checking container images on projectGrzegorz Bizon2017-07-141-1/+1
| |
| * Recover from renaming project that has container imagesGrzegorz Bizon2017-07-131-2/+2
| |
* | Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern2017-07-142-26/+3
| | | | | | This reverts merge request !12633
* | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-141-0/+2
|\ \ | | | | | | | | | | | | Gitlab::Git shuffling and Gitaly annotations See merge request !12849
| * | More Gitaly annotationsJacob Vosmaer2017-07-131-0/+2
| |/
* | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-142-5/+9
|\ \ | | | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491
| * | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-132-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* | | Merge branch 'dm-merge-request-creation-error' into 'master'Stan Hu2017-07-141-6/+31
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Make sure MergeRequest commit methods work when either compare_commits or merge_request_diff is set Closes #35077 See merge request !12856
| * | Make sure MergeRequest commit methods work when either compare_commits or ↵dm-merge-request-creation-errorDouwe Maan2017-07-131-6/+31
| | | | | | | | | | | | merge_request_diff is set
* | | Stop sanitizing user 'name' when inserting into dbNathan Neulinger2017-07-121-1/+1
| | | | | | | | | | | | Add spec tests for encoding
* | | Support multiple Redis instances based on queue typePaul Charlton2017-07-112-5/+5
| |/ |/|
* | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-101-0/+3
| |
* | Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-101-2/+4
|\ \ | | | | | | | | | | | | Allow passing exceptions when creating project services See merge request !12745
| * | Allow passing exceptions when creating project servicesbackport-exceptions-argumentSean McGivern2017-07-101-2/+4
| |/
* | Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-101-3/+7
|\ \ | |/ |/| | | | | Fix offline runner detection See merge request !11751
| * Fix offline runner detectionAlessio Caiazza2017-07-071-3/+7
| |
* | Merge branch 'sh-optimize-mr-api' into 'master'Stan Hu2017-07-081-1/+1
|\ \ | | | | | | | | | | | | Remove many N+1 queries with merge requests API See merge request !12726
| * | Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-071-1/+1
| | | | | | | | | | | | | | | | | | Identified via `ENABLE_BULLET=1 bundle exec rspec spec/requests/api/merge_requests_spec.rb:34` Improves speed of #34159
* | | Username and password are no longer stripped from import url on importusername-password-stripped-from-import-url-fixTiago Botelho2017-07-071-0/+5
| | |
* | | Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-074-2/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add creation time filters to user search API for admins Closes #29507 See merge request !12682
| * | fix specJames Lopez2017-07-071-0/+1
| | |
| * | fix created_afterJames Lopez2017-07-071-2/+0
| | |
| * | refactor created at filter to use model scopesJames Lopez2017-07-073-0/+14
| | |
* | | Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-072-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Include new URL helpers retroactively into includers of Gitlab::Routing Closes #34821 See merge request !12716
| * | | Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-072-2/+2
| | | |
* | | | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master'Sean McGivern2017-07-071-0/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to enable the performance bar per user or Feature group Closes #33929 and #34528 See merge request !12362
| * \ \ \ Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-0713-13/+159
| |\ \ \ \ | | |/ / / | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-0748-246/+342
| |\ \ \ \
| * | | | | Don't use Flipper for the Performance BarRémy Coutable2017-07-071-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation now simply rely on the `performance_bar_allowed_group_id` Application Setting. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'active-record-each-batch' into 'master'Sean McGivern2017-07-071-0/+81
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Added EachBatch for iterating tables in batches See merge request !12707
| * | | | | Added EachBatch for iterating tables in batchesactive-record-each-batchYorick Peterse2017-07-071-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module provides a class method called `each_batch` that can be used to iterate tables in batches in a more efficient way compared to Rails' `in_batches` method. This commit also includes a RuboCop cop to blacklist the use of `in_batches` in favour of this new method.
* | | | | | Merge branch ↵Kamil Trzciński2017-07-073-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' Add variables to pipelines schedules Closes #32568 See merge request !12372
| * \ \ \ \ \ Merge from master(Fix conflicts)Shinya Maeda2017-07-077-0/+36
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | merge from masterShinya Maeda2017-07-0748-276/+354
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Remove validates :key, uniqueness due to new validator covers the casefeature/intermediate/32568-adding-variables-to-pipelines-schedulesShinya Maeda2017-07-071-2/+0
| | | | | | |
| * | | | | | Implement ayufan validatorShinya Maeda2017-07-061-5/+1
| | | | | | |
| * | | | | | Revert "Implement Ci::NestedUniquenessValidator"Shinya Maeda2017-07-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8f0a2b6d780347a5ce258ac1a6a6902ce9695ca1.
| * | | | | | Revert unnecesarry changesShinya Maeda2017-07-051-2/+5
| | | | | | |
View Lorry Controller Status