Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support multiple Redis instances based on queue type | Paul Charlton | 2017-07-11 | 2 | -5/+5 |
| | |||||
* | Prevent bad data being added to application settings when Redis is unavailable | Nick Thomas | 2017-07-10 | 1 | -0/+3 |
| | |||||
* | Merge branch 'backport-exceptions-argument' into 'master' | Rémy Coutable | 2017-07-10 | 1 | -2/+4 |
|\ | | | | | | | | | Allow passing exceptions when creating project services See merge request !12745 | ||||
| * | Allow passing exceptions when creating project servicesbackport-exceptions-argument | Sean McGivern | 2017-07-10 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'fix/offline_runner_detection' into 'master' | Rémy Coutable | 2017-07-10 | 1 | -3/+7 |
|\ \ | |/ |/| | | | | | Fix offline runner detection See merge request !11751 | ||||
| * | Fix offline runner detection | Alessio Caiazza | 2017-07-07 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'sh-optimize-mr-api' into 'master' | Stan Hu | 2017-07-08 | 1 | -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-api | Stan Hu | 2017-07-07 | 1 | -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-fix | Tiago Botelho | 2017-07-07 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'feature/user-datetime-search-api-mysql' into 'master' | Douwe Maan | 2017-07-07 | 4 | -2/+15 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | Add creation time filters to user search API for admins Closes #29507 See merge request !12682 | ||||
| * | | fix spec | James Lopez | 2017-07-07 | 1 | -0/+1 |
| | | | |||||
| * | | fix created_after | James Lopez | 2017-07-07 | 1 | -2/+0 |
| | | | |||||
| * | | refactor created at filter to use model scopes | James Lopez | 2017-07-07 | 3 | -0/+14 |
| | | | |||||
* | | | Merge branch 'dm-fix-project-path-helpers-production' into 'master' | Douwe Maan | 2017-07-07 | 2 | -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-production | Douwe Maan | 2017-07-07 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master' | Sean McGivern | 2017-07-07 | 1 | -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 McGivern | 2017-07-07 | 13 | -13/+159 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| * | | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-group | Sean McGivern | 2017-07-07 | 48 | -246/+342 |
| |\ \ \ \ | |||||
| * | | | | | Don't use Flipper for the Performance Bar | Rémy Coutable | 2017-07-07 | 1 | -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 area | Rémy Coutable | 2017-07-06 | 1 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | Merge branch 'active-record-each-batch' into 'master' | Sean McGivern | 2017-07-07 | 1 | -0/+81 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Added EachBatch for iterating tables in batches See merge request !12707 | ||||
| * | | | | | Added EachBatch for iterating tables in batchesactive-record-each-batch | Yorick Peterse | 2017-07-07 | 1 | -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ński | 2017-07-07 | 3 | -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 Maeda | 2017-07-07 | 7 | -0/+36 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | merge from master | Shinya Maeda | 2017-07-07 | 48 | -276/+354 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Remove validates :key, uniqueness due to new validator covers the casefeature/intermediate/32568-adding-variables-to-pipelines-schedules | Shinya Maeda | 2017-07-07 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Implement ayufan validator | Shinya Maeda | 2017-07-06 | 1 | -5/+1 |
| | | | | | | | |||||
| * | | | | | | Revert "Implement Ci::NestedUniquenessValidator" | Shinya Maeda | 2017-07-06 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8f0a2b6d780347a5ce258ac1a6a6902ce9695ca1. | ||||
| * | | | | | | Revert unnecesarry changes | Shinya Maeda | 2017-07-05 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Implement Ci::NestedUniquenessValidator | Shinya Maeda | 2017-07-05 | 1 | -5/+0 |
| | | | | | | | |||||
| * | | | | | | Implement uniqueness_of_in_memory_validator | Shinya Maeda | 2017-07-05 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | Exclude schedule variables from Import/Export feature | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix spec. Add PipelineScheduleVariable for import_export | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix spec | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | revert trigger_request.user_variables | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | zj nice catches | Shinya Maeda | 2017-07-05 | 2 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Remove dependent => :destroy | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Eliminate condition cases in ci/build.rb | Shinya Maeda | 2017-07-05 | 1 | -5/+2 |
| | | | | | | | |||||
| * | | | | | | Implement variables_attributes create/update cases | Shinya Maeda | 2017-07-05 | 1 | -10/+0 |
| | | | | | | | |||||
| * | | | | | | Controller logic. Delete before modification. Halfway. | Shinya Maeda | 2017-07-05 | 2 | -10/+12 |
| | | | | | | | |||||
| * | | | | | | pipeline_schedule_variables model/db | Shinya Maeda | 2017-07-05 | 2 | -8/+7 |
| | | | | | | | |||||
| * | | | | | | Implement uniqueness_of_in_memory_validator | Shinya Maeda | 2017-07-05 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | Exclude schedule variables from Import/Export feature | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix spec. Add PipelineScheduleVariable for import_export | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix spec | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | revert trigger_request.user_variables | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | zj nice catches | Shinya Maeda | 2017-07-05 | 2 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Remove dependent => :destroy | Shinya Maeda | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Eliminate condition cases in ci/build.rb | Shinya Maeda | 2017-07-05 | 1 | -5/+2 |
| | | | | | | | |||||
| * | | | | | | Implement variables_attributes create/update cases | Shinya Maeda | 2017-07-05 | 1 | -10/+0 |
| | | | | | | |