summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Find and mark more Git disk access locationsJacob Vosmaer (GitLab)2018-06-051-1/+4
* Merge branch 'ce-6021-extract-ee-services' into 'master'Rémy Coutable2018-06-053-3/+6
|\
| * Backport changes in app/services/application_settings/update_service.rbce-6021-extract-ee-servicesMario de la Ossa2018-06-041-0/+2
| * Backport changes in app/services/applications/create_service/rbMario de la Ossa2018-06-021-2/+1
| * Backport changes in app/services/test_hooks/project_service.rbMario de la Ossa2018-06-021-1/+3
* | Merge branch '46585-gdpr-terms-acceptance' into 'master'Robert Speicher2018-06-054-0/+16
|\ \
| * | Messaging on terms page when user already accepted46585-gdpr-terms-acceptancetauriedavis2018-06-044-0/+16
* | | 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 'fix-form-headers' into 'master'Filipa Lacerda2018-06-051-0/+5
|\ \ \ \
| * | | | Fix form headersfix-form-headersClement Ho2018-06-041-0/+5
* | | | | Merge branch '42751-rename-mr-maintainer-push' into 'master'Robert Speicher2018-06-0512-34/+34
|\ \ \ \ \
| * | | | | Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-0112-34/+34
* | | | | | 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
| | |_|_|/ / | |/| | | |
* | | | | | Resolve "Active tab for new project doesn't change properly"Annabel Gray2018-06-052-7/+9
* | | | | | Merge branch 'fix-avatars-n-plus-one' into 'master'Robert Speicher2018-06-055-2/+58
|\ \ \ \ \ \
| * | | | | | Fix an N+1 in avatar URLsSean McGivern2018-06-055-2/+58
* | | | | | | Merge branch '41772-huge-artifacts-block' into 'master'Phil Hughes2018-06-052-7/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixes download button for artifacts rendering a huge block41772-huge-artifacts-blockFilipa Lacerda2018-06-052-7/+1
* | | | | | | | Fix layout in admin edit user formClement Ho2018-06-052-11/+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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '46452-nomethoderror-undefined-method-previous_changes-for-nil-n...Kamil Trzciński2018-06-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use nullcheck operator instead of checking for nullMatija Čupić2018-06-051-1/+1
| * | | | | | | | Add check for nil auto_devops in Projects::UpdateServiceMatija Čupić2018-05-281-1/+1
* | | | | | | | | Merge branch 'optimise-pages-service-calling' into 'master'Grzegorz Bizon2018-06-053-23/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-callingKamil Trzciński2018-06-052-16/+6
| * | | | | | | | | Remove unused running_or_pending_build_countremove-unused-query-in-hooksKamil Trzciński2018-06-042-7/+0
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-projects-update-service-parity' into 'master'Rémy Coutable2018-06-051-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Yield to an optional block in Projects::UpdateServicers-projects-update-service-parityRobert Speicher2018-06-041-0/+2
| * | | | | | | | | Bring CE-EE parity to app/services/projects/update_service.rbRobert Speicher2018-06-041-2/+2
| |/ / / / / / / /
* | | | | | | | | Resolve "Add Xcode Button in UI"André Luís2018-06-053-0/+14
* | | | | | | | | Merge branch 'ide-alignment-fixes' into 'master'Filipa Lacerda2018-06-052-6/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fixed SVG alignmentide-alignment-fixesPhil Hughes2018-06-041-1/+1
| * | | | | | | | | Fixed alignment issues with IDE sidebarPhil Hughes2018-06-042-5/+26
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-jobs-log' into 'master'Filipa Lacerda2018-06-051-0/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix jobs log background colorfix-jobs-logClement Ho2018-06-041-0/+5
* | | | | | | | | Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon2018-06-052-16/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Support presigned multipart uploadsKamil Trzciński2018-06-042-16/+7
* | | | | | | | | | Merge branch '47236-print-fix' into 'master'Phil Hughes2018-06-051-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove sidebar and monitoring nav from print view47236-print-fixAnnabel Dunstone Gray2018-06-041-2/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Support smarter system notesJose Ivan Vargas2018-06-053-1/+112
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch '36862-subgroup-milestones' into 'master'Sean McGivern2018-06-052-5/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include all ancestors milestones in json list & autocomplete36862-subgroup-milestonesJarka Kadlecová2018-06-042-5/+6
* | | | | | | | | | Merge branch '47266-visiblity-import-sources-checkbox-styling' into 'master'Sean McGivern2018-06-052-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add form-check-input class to checkbox input for visibility levels and import...47266-visiblity-import-sources-checkbox-stylingtauriedavis2018-06-042-4/+6
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bvl-hide-archived-shared-projects' into 'master'Sean McGivern2018-06-051-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hide archived projects from `shared_projects`bvl-hide-archived-shared-projectsBob Van Landuyt2018-06-041-1/+3
| |/ / / / / / / / /
* | | | | | | | | | Resolve "New project visibility level description alignment"Taurie Davis2018-06-052-3/+3
View Lorry Controller Status