summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-merge-request-creation-error' into 'master'Stan Hu2017-07-141-6/+31
* Merge branch 'revert-73579e66' into 'master'Grzegorz Bizon2017-07-142-26/+3
* Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-111-2/+4
* Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-111-3/+7
* Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-111-0/+3
* Merge branch 'sh-optimize-mr-api' into 'master'Stan Hu2017-07-081-1/+1
|\
| * Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-071-1/+1
* | 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
|\ \ | |/ |/|
| * 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::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
|\ \ \
| * \ \ Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-0713-13/+159
| |\ \ \ | | |/ /
| * | | 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
| * | | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-0/+37
* | | | | 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 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil Trzciński2017-07-073-0/+17
|\ \ \ \ \
| * \ \ \ \ 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
| * | | | | Revert unnecesarry changesShinya Maeda2017-07-051-2/+5
| * | | | | Implement Ci::NestedUniquenessValidatorShinya Maeda2017-07-051-5/+0
| * | | | | 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
| * | | | | revert trigger_request.user_variablesShinya Maeda2017-07-051-1/+1
| * | | | | zj nice catchesShinya Maeda2017-07-052-1/+5
| * | | | | Remove dependent => :destroyShinya Maeda2017-07-051-1/+1
| * | | | | Eliminate condition cases in ci/build.rbShinya Maeda2017-07-051-5/+2
| * | | | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-10/+0
| * | | | | Controller logic. Delete before modification. Halfway.Shinya Maeda2017-07-052-10/+12
| * | | | | pipeline_schedule_variables model/dbShinya Maeda2017-07-052-8/+7
| * | | | | 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
| * | | | | revert trigger_request.user_variablesShinya Maeda2017-07-051-1/+1
| * | | | | zj nice catchesShinya Maeda2017-07-052-1/+5
| * | | | | Remove dependent => :destroyShinya Maeda2017-07-051-1/+1
| * | | | | Eliminate condition cases in ci/build.rbShinya Maeda2017-07-051-5/+2
| * | | | | Implement variables_attributes create/update casesShinya Maeda2017-07-051-10/+0
| * | | | | Controller logic. Delete before modification. Halfway.Shinya Maeda2017-07-052-1/+14
View Lorry Controller Status