summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Revert rename allow collaboration columnMark Chao2018-06-081-1/+4
* Backport of "Add assignee lists to boards"Mario de la Ossa2018-06-071-4/+14
* Merge branch 'issue_44230' into 'master'Sean McGivern2018-06-072-2/+47
|\
| * Apply notification settings level of groups to all child objectsFelipe Artur2018-06-072-2/+47
* | Merge remote-tracking branch 'origin/master' into 38542-application-control-p...Kamil Trzciński2018-06-078-5/+45
|\ \
| * | Resolve "Automatically provide a Deploy Token to projects when Auto DevOps is...Mayra Cabrera2018-06-071-0/+21
| * | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-1/+2
| |\ \
| | * | use Gitlab::Favicon for jira serviceAlexis Reigel2018-06-051-1/+1
| | * | remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-051-1/+1
| | * | allow uploading favicon in appearance settingsAlexis Reigel2018-06-051-0/+1
| * | | Merge branch 'n-plus-one-notification-recipients' into 'master'Rémy Coutable2018-06-072-2/+5
| |\ \ \
| | * | | Fix some N+1s when calculating notification recipientsSean McGivern2018-06-072-2/+5
| * | | | Merge branch '6216-extract-ee-specific-files-lines-for-app-views-admin-groups...Sean McGivern2018-06-071-2/+7
| |\ \ \ \
| | * | | | Reduce CE/EE diff in app/views/admin/groups/Rémy Coutable2018-06-061-2/+7
| * | | | | 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
* | | | | | | | | | Use 0 continuous default for deploy strategyMatija Čupić2018-06-071-2/+2
* | | | | | | | | | Merge branch 'master' into 38542-application-control-panel-in-settings-pageMatija Čupić2018-06-0627-55/+209
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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
| | | |/ / / / / | | |/| | | | |