summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-073-3/+3
|\ | | | | | | | | | | | | 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-073-3/+3
| |
* | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master'Sean McGivern2017-07-076-17/+80
|\ \ | | | | | | | | | | | | | | | | | | 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-0763-278/+730
| |\ \ | | |/ | | | | | | # Conflicts: # db/schema.rb
| * | Fix performance bar cookieSean McGivern2017-07-071-1/+1
| | |
| * | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-07122-554/+972
| |\ \
| * | | 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-063-0/+55
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Improve feature flag check for the performance barRémy Coutable2017-07-062-2/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-063-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-062-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A `performance_team` Flipper group has been created. By default this group is nil but this can be customized in `gitlab.yml` via the performance_bar.allowed_group setting. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'new-admin-sidebar-jobs-fix' into 'master'Annabel Dunstone Gray2017-07-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed jobs page not being in new admin sidebar See merge request !12710
| * | | | Fixed jobs page not being in new admin sidebarnew-admin-sidebar-jobs-fixPhil Hughes2017-07-071-2/+2
| | | | |
* | | | | 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 'fix-mrs-merged-immediately' into 'master'Robert Speicher2017-07-071-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't mark empty MRs as merged on push to the target branch Closes #32800 See merge request !12711
| * | | | | | Don't mark empty MRs as merged on push to the target branchfix-mrs-merged-immediatelySean McGivern2017-07-071-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we push to an MR's target branch, we check if the MR's HEAD commit is contained in the push. This lets us mark MRs as merged if they were merged manually. However, we also added a feature where you can create an empty MR from an issue. If that MR is created around the time of a merge to the default branch, we would process the push after creating the MR, and consider it to be a manual merge. To fix that, we exclude empty MRs from this process. If they are empty, they were empty before the push we're processing, so we shouldn't touch them!
* | | | | | Fixed text overflow issue in new sidebarsPhil Hughes2017-07-073-2/+8
| | | | | |
* | | | | | Moves alert boxes to below the breadcrumbsPhil Hughes2017-07-073-4/+8
| |_|_|_|/ |/| | | |
* | | | | Merge branch ↵Kamil Trzciński2017-07-0714-8/+243
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-0727-41/+245
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Remove update|admin_pipeline_schedule from Project, and grant it in ↵Kamil Trzcinski2017-07-074-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | PipelineSchedule
| * | | | | merge from masterShinya Maeda2017-07-07435-2621/+2702
| |\ \ \ \ \
| * | | | | | Remove validates :key, uniqueness due to new validator covers the casefeature/intermediate/32568-adding-variables-to-pipelines-schedulesShinya Maeda2017-07-071-2/+0
| | | | | | |
| * | | | | | Update variable rows to be full width with extra buttonEric Eastwood2017-07-064-25/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.slack.com/archives/C5XGWBRJA/p1499355359953774
| * | | | | | Implement ayufan validator2Shinya Maeda2017-07-061-0/+13
| | | | | | |
| * | | | | | Implement ayufan validatorShinya Maeda2017-07-062-42/+1
| | | | | | |
| * | | | | | Revert "Implement Ci::NestedUniquenessValidator"Shinya Maeda2017-07-065-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8f0a2b6d780347a5ce258ac1a6a6902ce9695ca1.
| * | | | | | Revert unnecesarry changesShinya Maeda2017-07-051-2/+5
| | | | | | |
| * | | | | | Update scheduled variable translation stringsEric Eastwood2017-07-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12372#note_34142476
| * | | | | | Implement Ci::NestedUniquenessValidatorShinya Maeda2017-07-055-45/+32
| | | | | | |
| * | | | | | Use each loop because index is no longer usedEric Eastwood2017-07-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12372#note_34120330
| * | | | | | zj nice catchies 3Shinya Maeda2017-07-051-1/+1
| | | | | | |
| * | | | | | Implement uniqueness_of_in_memory_validatorShinya Maeda2017-07-051-0/+5
| | | | | | |
| * | | | | | Exclude schedule variables from Import/Export featureShinya Maeda2017-07-051-1/+1
| | | | | | |
| * | | | | | Fix spec. Add PipelineScheduleVariable for import_exportShinya Maeda2017-07-051-1/+1
| | | | | | |
| * | | | | | Fix specShinya Maeda2017-07-051-1/+1
| | | | | | |
| * | | | | | Fix policy by new guild lineShinya Maeda2017-07-051-8/+10
| | | | | | |
| * | | | | | Schedule pipelines with variablesEric Eastwood2017-07-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32568
| * | | | | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-28/+2
| | | | | | |
| * | | | | | Remove _form.html.haml changeShinya Maeda2017-07-051-32/+0
| | | | | | |
| * | | | | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-2/+28
| | | | | | |
| * | | | | | Controller logic. Delete before modification. Halfway.Shinya Maeda2017-07-051-0/+32
| | | | | | |
| * | | | | | zh nich catches 2Shinya Maeda2017-07-052-3/+7
| | | | | | |
| * | | | | | revert trigger_request.user_variablesShinya Maeda2017-07-051-1/+1
| | | | | | |
| * | | | | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-052-30/+3
| | | | | | |
| * | | | | | Remove _form.html.haml changeShinya Maeda2017-07-051-32/+0
| | | | | | |
| * | | | | | zj nice catchesShinya Maeda2017-07-052-1/+5
| | | | | | |
| * | | | | | Remove dependent => :destroyShinya Maeda2017-07-051-1/+1
| | | | | | |
View Lorry Controller Status