summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '39549-label-list-page-redesign-with-draggable-labels' into 'mas...Tim Zallmann2018-06-071-0/+4
|\
| * Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-lab...Luke Bennett2018-06-074-3/+8
| |\
| * \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-0615-28/+159
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-052-8/+11
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-0554-167/+335
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-05-2883-407/+1929
| |\ \ \ \ \
| * | | | | | Add/use Label#priority? and remove weird paddingLuke Bennett2018-04-191-0/+4
* | | | | | | Merge branch '47208-human-import-status-name-not-working' into 'master'Douwe Maan2018-06-071-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Adds #human_import_status_name to make it comply with ProjectImportState#huma...47208-human-import-status-name-not-workingTiago Botelho2018-06-061-0/+6
* | | | | | | Support LFS objects when creating a project by importFrancisco Javier López2018-06-061-0/+4
* | | | | | | Merge branch '42751-rename-master-to-maintainer' into 'master'Sean McGivern2018-06-062-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Rename “Developers + Masters”Mark Chao2018-06-061-2/+2
| * | | | | | | Rename master to maintainerMark Chao2018-06-061-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix the query to select stale live tracesShinya Maeda2018-06-061-15/+1
* | | | | | | Move find_builds_from_stale_live_traces method to Ci::BuildShinya Maeda2018-06-062-15/+15
* | | | | | | Rename find_stale_in_batches to find_builds_from_stale_live_trace. Fix commentsShinya Maeda2018-06-061-2/+2
* | | | | | | Add tests for each new codeShinya Maeda2018-06-061-1/+1
* | | | | | | Rename find_stale. Fix worker name in declaration.Shinya Maeda2018-06-061-1/+1
* | | | | | | Clean up workerShinya Maeda2018-06-061-0/+15
|/ / / / / /
* | | | | | Fix repository archive generation when hashed storage is enabledNick Thomas2018-06-051-0/+10
* | | | | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...Kamil Trzciński2018-06-059-17/+79
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '46585-gdpr-terms-acceptance' into 'master'Robert Speicher2018-06-052-0/+8
| |\ \ \ \ \ \
| | * | | | | | Messaging on terms page when user already accepted46585-gdpr-terms-acceptancetauriedavis2018-06-042-0/+8
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-052-13/+13
| |\ \ \ \ \ \
| | * | | | | | Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-012-13/+13
| * | | | | | | Merge branch 'optimise-runner-update-cached-info' into 'master'Grzegorz Bizon2018-06-051-4/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Do not validate cached dataoptimise-runner-update-cached-infoKamil Trzciński2018-06-051-4/+2
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'fix-avatars-n-plus-one' into 'master'Robert Speicher2018-06-054-0/+56
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix an N+1 in avatar URLsSean McGivern2018-06-054-0/+56
| | |/ / / / /
* | | | | | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...Grzegorz Bizon2018-06-052-8/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'add-background-migrations-for-not-archived-traces' into 'master'Kamil Trzciński2018-06-051-0/+5
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Directly refer application code from migration codeShinya Maeda2018-06-041-0/+5
| * | | | | | Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-callingKamil Trzciński2018-06-051-1/+6
| * | | | | | Remove unused running_or_pending_build_countremove-unused-query-in-hooksKamil Trzciński2018-06-042-7/+0
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...backstage/gb/use-persisted-stages-to-improve-pipelines-tableGrzegorz Bizon2018-06-0554-147/+331
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add ability to search wiki titlesFrancisco Javier López2018-06-041-4/+0
| * | | | | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-042-3/+3
| |\ \ \ \ \
| | * | | | | Fix attr_encryption key settingsStan Hu2018-06-022-3/+3
| | |/ / / /
| * | | | | Merge branch 'master' into per-project-pipeline-iidShinya Maeda2018-06-0237-66/+224
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-016-7/+7
| | |\ \ \ \
| | | * | | | Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-296-7/+7
| | * | | | | Resolve "Update `updated_at` on an issue/mr on every issue/mr changes"🙈 jacopo beschi 🙉2018-06-012-8/+2
| | * | | | | Merge branch 'reactive-caching-alive-bug' into 'master'Nick Thomas2018-06-011-0/+1
| | |\ \ \ \ \
| | | * | | | | ReactiveCaching#clear_reactive_cache! should clear the not keep the cache aliveTiago Botelho2018-06-011-0/+1
| | * | | | | | Merge branch '46913-appearance-uploader-fields-and-description-html-are-missi...Douwe Maan2018-06-011-9/+29
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Use RequestStore in CacheableAttributes.cached for greater performanceRémy Coutable2018-06-011-1/+5
| | | * | | | | Revert to caching the AR object in CacheableAttributesRémy Coutable2018-06-011-9/+25
| | * | | | | | Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'm...Kamil Trzciński2018-06-016-18/+53
| | |\ \ \ \ \ \
| | | * | | | | | Run `Ci::Runner#assign_to` in transactionKamil Trzciński2018-05-311-2/+9
| | | * | | | | | Add uniqueness for RunnerNamespaceKamil Trzciński2018-05-311-0/+2