summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-071-1/+1
* 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::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
|\ \
| * \ Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-0763-278/+730
| |\ \ | | |/
| * | 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
| * | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-063-0/+55
| * | | Improve feature flag check for the performance barRémy Coutable2017-07-062-2/+7
| * | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-063-3/+5
| * | | Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-062-16/+18
* | | | Merge branch 'new-admin-sidebar-jobs-fix' into 'master'Annabel Dunstone Gray2017-07-071-2/+2
|\ \ \ \
| * | | | 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 batchesactive-record-each-batchYorick Peterse2017-07-071-0/+81
* | | | | | 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 branchfix-mrs-merged-immediatelySean McGivern2017-07-071-2/+3
| |/ / / / /
* | | | | | 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 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil Trzciński2017-07-0714-8/+243
|\ \ \ \ \
| * \ \ \ \ Merge from master(Fix conflicts)Shinya Maeda2017-07-0727-41/+245
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Remove update|admin_pipeline_schedule from Project, and grant it in PipelineS...Kamil Trzcinski2017-07-074-19/+10
| * | | | | 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
| * | | | | | 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
| * | | | | | Revert unnecesarry changesShinya Maeda2017-07-051-2/+5
| * | | | | | Update scheduled variable translation stringsEric Eastwood2017-07-052-4/+4
| * | | | | | Implement Ci::NestedUniquenessValidatorShinya Maeda2017-07-055-45/+32
| * | | | | | Use each loop because index is no longer usedEric Eastwood2017-07-051-3/+2
| * | | | | | 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
| * | | | | | 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