summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bring CE-EE parity to app/services/milestones/base_service.rbrs-milestones-base-service-parityRobert Speicher2018-05-171-0/+1
* Merge branch 'order_groups' into 'master'Rémy Coutable2018-05-175-2/+149
|\
| * Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-175-2/+149
|/
* Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-177-5/+45
|\
| * Backport changes from EE to minimize the CE/EE diff in Projects::Settings::In...6020-extract-ee-specific-controller-linesRémy Coutable2018-05-162-2/+17
| * Introduce a new Keys::DestroyService serviceRémy Coutable2018-05-164-2/+27
| * Add :weight as an allowed serializable field in app/controllers/boards/issues...Rémy Coutable2018-05-161-1/+1
* | Merge branch 'pipelines-index-performance' into 'master'Grzegorz Bizon2018-05-1711-24/+233
|\ \
| * | Added changelog for pipelines page performanceYorick Peterse2018-05-171-0/+5
| * | Exclude coverage data from the pipelines pageYorick Peterse2018-05-174-2/+19
| * | Preload pipeline data for project pipelinesYorick Peterse2018-05-177-7/+195
| * | Limit the number of pipelines to countYorick Peterse2018-05-172-15/+14
* | | Merge branch '46177-fix-present-on-generic-commit-status' into 'master'Grzegorz Bizon2018-05-179-25/+61
|\ \ \
| * | | Add changelogMayra Cabrera2018-05-171-0/+5
| * | | Respect the inheritance chain between Ci::Build and CommitStatus46177-fix-present-on-generic-commit-statusMayra Cabrera2018-05-166-31/+48
| * | | Makes CommitStatus and GenericCommitStatus respond to presentableMayra Cabrera2018-05-154-0/+14
* | | | Merge branch 'docs/46042-document-that-project-templates-can-be-used-with-aut...Achilleas Pipinellis2018-05-171-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Update quick_start_guide.mdFabio Busatto2018-05-171-0/+4
|/ / /
* | | Merge branch '42531-open-invite-404' into 'master'Douwe Maan2018-05-179-15/+157
|\ \ \
| * | | Resolve "Opening Project with invite but without accepting leads to 404 error...🙈 jacopo beschi 🙉2018-05-179-15/+157
|/ / /
* | | Merge branch 'ce-5980-add-ce-upgrade-ee-test' into 'master'Douwe Maan2018-05-175-22/+25
|\ \ \
| * | | Grant privileges after database is createdce-5980-add-ce-upgrade-ee-testLin Jen-Shin2018-05-165-16/+14
| * | | Only setup db in the first checkout!Lin Jen-Shin2018-05-163-6/+11
* | | | Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-176-70/+16
|\ \ \ \
| * | | | Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-166-70/+16
* | | | | Merge branch 'remove-css-imports' into 'master'Phil Hughes2018-05-172-4/+0
|\ \ \ \ \
| * | | | | Remove unneccessary importsremove-css-importsAnnabel Dunstone Gray2018-05-162-4/+0
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jivl-add-dot-system-notes' into 'master'Phil Hughes2018-05-175-5/+18
|\ \ \ \ \
| * | | | | Add dot to separate system notes contentjivl-add-dot-system-notesJose2018-05-145-5/+18
* | | | | | Merge branch 'jprovazn-remote-upload-destroy' into 'master'Kamil Trzciński2018-05-1613-11/+109
|\ \ \ \ \ \
| * | | | | | Whitelisted query limits for group destroy APIjprovazn-remote-upload-destroyJan Provaznik2018-05-162-0/+2
| * | | | | | Fixed typoJan Provaznik2018-05-161-1/+1
| * | | | | | Changed order of includeJan Provaznik2018-05-164-4/+4
| * | | | | | Use find_in_batches instead of destroy_allJan Provaznik2018-05-161-1/+3
| * | | | | | Delete remote uploadsJan Provaznik2018-05-1611-11/+105
* | | | | | | Merge branch '46010-allow-managing-group-runners-via-api' into 'master'Kamil Trzciński2018-05-1610-97/+120
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Refactor out duplication in runner_policy.rb46010-allow-managing-group-runners-via-apiDylan Griffith2018-05-161-4/+8
| * | | | | | Remove unnecessary runner.is_shared? checks in api because they are handled b...Dylan Griffith2018-05-161-2/+0
| * | | | | | Allow admin to assign shared runner to project through APIDylan Griffith2018-05-162-2/+11
| * | | | | | Change policy list_runner_jobs -> read_runnerDylan Griffith2018-05-162-2/+1
| * | | | | | Rename User#ci_authorized_runners -> ci_owned_runnersDylan Griffith2018-05-166-18/+18
| * | | | | | Improve efficiency of authorized_runner policy queryDylan Griffith2018-05-161-1/+1
| * | | | | | Use can? policies for lib/api/runners.rbDylan Griffith2018-05-162-13/+9
| * | | | | | Allow group runners to be viewed/edited in APIDylan Griffith2018-05-167-70/+87
* | | | | | | Merge branch 'fix/contributors-graph-width' into 'master'Mike Greiling2018-05-162-18/+41
|\ \ \ \ \ \ \
| * | | | | | | Use correct base widthPaul Vorbach2018-05-151-8/+22
| * | | | | | | Refactor duplicate codePaul Vorbach2018-05-151-6/+10
| * | | | | | | Add changelog entry for contrib graphs width fixPaul Vorbach2018-05-151-0/+5
| * | | | | | | Use ES6 `const` more consistentlyPaul Vorbach2018-05-151-9/+6
| * | | | | | | Fix width of contributors graphsPaul Vorbach2018-05-151-3/+6