summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Rubocop offense in build specsbackstage/gb/fix-rubocop-offense-in-build-specsGrzegorz Bizon2018-06-051-1/+1
* Merge branch 'optimise-pages-service-calling' into 'master'Grzegorz Bizon2018-06-058-78/+88
|\
| * Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-callingKamil Trzciński2018-06-055-69/+83
| * Remove unused running_or_pending_build_countremove-unused-query-in-hooksKamil Trzciński2018-06-044-9/+5
* | 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
| |/
* | Merge branch 'sh-fix-pipeline-jobs-nplus-one' into 'master'Rémy Coutable2018-06-053-0/+18
|\ \
| * | Eliminate N+1 queries for CI job artifacts in /api/projects/:id/pipelines/:pi...sh-fix-pipeline-jobs-nplus-oneStan Hu2018-06-043-0/+18
| * | Remove N+1 query for author in issues APIStan Hu2018-06-046-22/+78
* | | Merge branch '45820-add-xcode-link' into 'master'Phil Hughes2018-06-055-0/+61
|\ \ \
| * | | Resolve "Add Xcode Button in UI"André Luís2018-06-055-0/+61
|/ / /
* | | 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 'blackst0ne-update-gemfile-rails5' into 'master'Rémy Coutable2018-06-051-36/+35
|\ \ \ \ \
| * | | | | [Rails5] Update Gemfile.rails5.lockblackst0ne-update-gemfile-rails5blackst0ne2018-06-051-36/+35
| | |_|/ / | |/| | |
* | | | | Merge branch 'presigned-multipart-uploads' into 'master'Grzegorz Bizon2018-06-0515-123/+575
|\ \ \ \ \
| * | | | | Update validatorpresigned-multipart-uploadsKamil Trzciński2018-06-045-39/+22
| * | | | | Support presigned multipart uploadsKamil Trzciński2018-06-0415-123/+592
* | | | | | Merge branch 'sh-add-uncached-query-limiter' into 'master'Rémy Coutable2018-06-056-22/+78
|\ \ \ \ \ \
| * | | | | | Remove N+1 query for author in issues APIsh-add-uncached-query-limiterStan Hu2018-06-046-22/+78
* | | | | | | 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'jivl-smarter-system-notes' into 'master'Phil Hughes2018-06-057-2/+759
|\ \ \ \ \ \ \
| * | | | | | | Support smarter system notesJose Ivan Vargas2018-06-057-2/+759
|/ / / / / / /
* | | | | | | Merge branch 'perform-ci-build-auth-always-on-primary-ce' into 'master'Grzegorz Bizon2018-06-051-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Bring back the EE changes to CE to authentication of buildsperform-ci-build-auth-always-on-primary-ceKamil Trzciński2018-06-041-1/+7
| |/ / / / / /
* | | | | | | Merge branch 'update_vendored_ADO_template' into 'master'Kamil Trzciński2018-06-051-10/+55
|\ \ \ \ \ \ \
| * | | | | | | Updated vendored ADO templateupdate_vendored_ADO_templateOlivier Gonzalez2018-06-041-10/+55
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'osw-ignore-diff-header-when-persisting-diff-hunk' into 'master'Sean McGivern2018-06-054-53/+78
|\ \ \ \ \ \ \
| * | | | | | | Adjust insufficient diff hunks being persisted on NoteDiffFileosw-ignore-diff-header-when-persisting-diff-hunkOswaldo Ferreira2018-06-054-53/+78
* | | | | | | | Merge branch '36862-subgroup-milestones' into 'master'Sean McGivern2018-06-055-14/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Include all ancestors milestones in json list & autocomplete36862-subgroup-milestonesJarka Kadlecová2018-06-045-14/+52
* | | | | | | | | 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-052-2/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hide archived projects from `shared_projects`bvl-hide-archived-shared-projectsBob Van Landuyt2018-06-042-2/+13
* | | | | | | | | | Merge branch 'dm-gitlab-shell-7-1-4' into 'master'Sean McGivern2018-06-051-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'dm-gitlab-shell-7-1-4'dm-gitlab-shell-7-1-4Sean McGivern2018-06-0411-36/+57
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Use gitlab-shell 7.1.4Douwe Maan2018-06-041-1/+1
* | | | | | | | | | | Merge branch '47147-project-visibility-alignment' into 'master'Clement Ho2018-06-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve "New project visibility level description alignment"Taurie Davis2018-06-052-3/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '47115-fix-markdown-blockquote' into 'master'Clement Ho2018-06-052-11/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Resolve "Markdown blockquote is not displaying properly"Paul Slaughter2018-06-052-11/+13
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '6287-epics-page-styling-is-broken' into 'master'Clement Ho2018-06-052-3/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Backport of Resolve "Epics Page Styling is broken"Clement Ho2018-06-042-3/+8
* | | | | | | | | | | Merge branch '47273-bs4-header-sub-nav-dropdown-active-states' into 'master'Clement Ho2018-06-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \