Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | 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 |
| | | | | | | |||||
| * | | | | | Controller logic. Delete before modification. Halfway. | Shinya Maeda | 2017-07-05 | 2 | -1/+14 |
| | | | | | | |||||
| * | | | | | pipeline_schedule_variables model/db | Shinya Maeda | 2017-07-05 | 3 | -1/+15 |
| | | | | | | |||||
* | | | | | | Merge branch '34590-fix-dashboard-labels-dropdown' into 'master' | Sean McGivern | 2017-07-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dashboard labels dropdown Closes #34590 See merge request !12708 | ||||
| * | | | | | | Fix dashboard labels dropdown | Nick Thomas | 2017-07-07 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Native group milestones | Felipe Artur | 2017-07-07 | 8 | -11/+137 |
| | | | | | | |||||
* | | | | | | Merge branch 'speed-up-merge-request-all-commits-shas' into 'master' | Douwe Maan | 2017-07-07 | 1 | -1/+4 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Speed up `all_commit_shas` for new merge requests See merge request !12706 | ||||
| * | | | | | Speed up `all_commit_shas` for new merge requests | Sean McGivern | 2017-07-07 | 1 | -1/+4 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For merge requests created after 9.4, we have a `merge_request_diff_commits` table we can get all the SHAs from very quickly. We just need to exclude these when we load from the legacy format, by ignoring diffs with no serialised commits. Once these have been migrated in the background, every MR will see this improvement. | ||||
* | | | | | Merge branch 'fix-sha-attribute-no-table' into 'master' | Yorick Peterse | 2017-07-07 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ShaAttribute concern when there is no table Closes #34798 See merge request !12705 | ||||
| * | | | | | Fix ShaAttribute concern when there is no tablefix-sha-attribute-no-table | Sean McGivern | 2017-07-07 | 1 | -0/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | When this is added to a new model, it would fail before the migrations were run - including when trying to run migrations in production mode! | ||||
* | | | | | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master' | Kamil Trzciński | 2017-07-07 | 4 | -0/+24 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Add Group secret variables Closes #12729 See merge request !12582 | ||||
| * | | | | secret_variables_for: rails readability versino | Shinya Maeda | 2017-07-07 | 1 | -11/+5 |
| | | | | | |||||
| * | | | | Add CASE When Clause for saving order when using where IN | Shinya Maeda | 2017-07-07 | 1 | -1/+9 |
| | | | | |