summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Promote visibility level helpers from Group to NamespaceNick Thomas2017-07-172-5/+5
* Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-sear...Sean McGivern2017-07-141-1/+1
|\
| * Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-141-1/+1
* | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' int...Sean McGivern2017-07-141-3/+5
|\ \ | |/ |/|
| * Implement memoization in project correctly this timefix/gb/recover-from-renaming-project-with-container-imagesGrzegorz Bizon2017-07-141-1/+3
| * Memoize result of checking container images on projectGrzegorz Bizon2017-07-141-1/+1
| * Recover from renaming project that has container imagesGrzegorz Bizon2017-07-131-2/+2
* | Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern2017-07-142-26/+3
* | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-141-0/+2
|\ \
| * | More Gitaly annotationsJacob Vosmaer2017-07-131-0/+2
| |/
* | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-142-5/+9
|\ \
| * | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-132-5/+9
* | | Merge branch 'dm-merge-request-creation-error' into 'master'Stan Hu2017-07-141-6/+31
|\ \ \ | |_|/ |/| |
| * | Make sure MergeRequest commit methods work when either compare_commits or mer...dm-merge-request-creation-errorDouwe Maan2017-07-131-6/+31
* | | Stop sanitizing user 'name' when inserting into dbNathan Neulinger2017-07-121-1/+1
* | | Support multiple Redis instances based on queue typePaul Charlton2017-07-112-5/+5
| |/ |/|
* | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-101-0/+3
* | Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-101-2/+4
|\ \
| * | Allow passing exceptions when creating project servicesbackport-exceptions-argumentSean McGivern2017-07-101-2/+4
| |/
* | Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-101-3/+7
|\ \ | |/ |/|
| * Fix offline runner detectionAlessio Caiazza2017-07-071-3/+7
* | 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