summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Backport of "Add assignee lists to boards"Mario de la Ossa2018-06-071-3/+11
* Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon2018-06-071-6/+1
|\
| * Force Postgres to avoid trigram indexes when in a groupSean McGivern2018-06-071-0/+1
| * Simplify issuable finder queriesSean McGivern2018-06-061-6/+0
* | Merge remote-tracking branch 'origin/master' into 38542-application-control-p...Kamil Trzciński2018-06-076-25/+50
|\ \
| * \ Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-1/+15
| |\ \
| | * | simplify uploader versions checkAlexis Reigel2018-06-051-9/+4
| | * | require uploaded file's name to match in any caseAlexis Reigel2018-06-051-1/+5
| | * | ability to get an image's alternative versionAlexis Reigel2018-06-051-1/+7
| | * | allow uploading favicon in appearance settingsAlexis Reigel2018-06-052-1/+10
| * | | Merge branch 'ccr/extract_EE_code_5942' into 'master'Sean McGivern2018-06-071-13/+17
| |\ \ \
| | * | | Backport of 5942-extract-ee-specific-filesccr/extract_EE_code_5942Chantal Rollison2018-06-011-13/+17
| * | | | Merge branch 'dz-fix-cluster-oauth' into 'master'Dmitriy Zaporozhets2018-06-071-1/+1
| |\ \ \ \
| | * | | | Pass request to oauth creation during cluster app installDmitriy Zaporozhets2018-06-071-1/+1
| * | | | | Merge branch '39549-label-list-page-redesign-with-draggable-labels' into 'mas...Tim Zallmann2018-06-071-10/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-lab...Luke Bennett2018-06-078-27/+65
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-066-8/+22
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-06-0517-75/+124
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redes...Luke Bennett2018-05-2851-231/+640
| | |\ \ \ \ \ \
| | * | | | | | | BE reviewLuke Bennett2018-05-251-4/+3
| | * | | | | | | Fix group labels listLuke Bennett2018-05-171-3/+3
| | * | | | | | | Start changing group label pageLuke Bennett2018-04-251-13/+17
| * | | | | | | | Log response body to production_json.log when a controller responds with a 42...Stan Hu2018-06-061-0/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'master' into 38542-application-control-panel-in-settings-pageMatija Čupić2018-06-0617-41/+96
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'sh-improve-import-status-error' into 'master'Fatih Acet2018-06-066-5/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Simplify error message handling in Projects::CreateServiceStan Hu2018-06-061-6/+1
| | * | | | | | | Show a more helpful error for import statusStan Hu2018-06-066-5/+14
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'bvl-graphql-start-34754' into 'master'Douwe Maan2018-06-061-0/+45
| |\ \ \ \ \ \ \
| | * | | | | | | Handle exceptions outside the GraphQL schemaBob Van Landuyt2018-06-051-21/+17
| | * | | | | | | Add a minimal GraphQL APINick Thomas2018-06-051-0/+49
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch '47196-actionview-missingtemplate-missing-template-projects-merg...Grzegorz Bizon2018-06-061-22/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Render 'invalid' if #target_branch_missing?Ash McKenzie2018-06-061-18/+7
| | * | | | | | Rename #check_if_can_be_merged -> #mark_merge_request_mergeableAsh McKenzie2018-06-061-2/+2
| | * | | | | | Rename #close_merge_request_without_source_projectAsh McKenzie2018-06-061-2/+2
| * | | | | | | Merge branch '5941-extract-ee-controllers' into 'master'Rémy Coutable2018-06-062-2/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Backport changes to app/controllers/groups/milestones_controller.rb5941-extract-ee-controllersMario de la Ossa2018-06-041-1/+4
| | * | | | | | Backport changes to app/controllers/groups/group_members_controller.rbMario de la Ossa2018-06-041-1/+5
| * | | | | | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...Kamil Trzciński2018-06-053-3/+12
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch '46585-gdpr-terms-acceptance' into 'master'Robert Speicher2018-06-051-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Messaging on terms page when user already accepted46585-gdpr-terms-acceptancetauriedavis2018-06-041-0/+4
| | | |/ / / / /
| | * | | | | | Merge branch 'bvl-403-for-external-auth-service-ce' into 'master'Douwe Maan2018-06-051-2/+7
| | |\ \ \ \ \ \
| | | * | | | | | Render a 403 when showing an access denied messagebvl-403-for-external-auth-service-ceBob Van Landuyt2018-06-051-2/+7
| | * | | | | | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-051-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-011-1/+1
| * | | | | | | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...Grzegorz Bizon2018-06-051-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon2018-06-051-1/+1
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Support presigned multipart uploadsKamil Trzciński2018-06-041-1/+1
| | | | |/ / / / | | | |/| | | |
| * | | | | | | Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipe...backstage/gb/use-persisted-stages-to-improve-pipelines-tableGrzegorz Bizon2018-06-0514-42/+115
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '36862-subgroup-milestones' into 'master'Sean McGivern2018-06-051-4/+5
| | |\ \ \ \ \ \
| | | * | | | | | Include all ancestors milestones in json list & autocomplete36862-subgroup-milestonesJarka Kadlecová2018-06-041-4/+5
| | | | |/ / / / | | | |/| | | |
View Lorry Controller Status