summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Bring CE-EE parity to app/services/milestones/base_service.rbrs-milestones-base-service-parityRobert Speicher2018-05-171-0/+1
* Fix: Use case in-sensitive ordering by name for groupsHarish Ved2018-05-171-2/+2
* Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-176-5/+32
|\
| * 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-163-2/+14
| * 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-174-16/+56
|\ \
| * | Exclude coverage data from the pipelines pageYorick Peterse2018-05-172-2/+6
| * | Preload pipeline data for project pipelinesYorick Peterse2018-05-173-3/+40
| * | Limit the number of pipelines to countYorick Peterse2018-05-171-11/+10
* | | Merge branch '46177-fix-present-on-generic-commit-status' into 'master'Grzegorz Bizon2018-05-174-24/+28
|\ \ \ | |/ / |/| |
| * | Respect the inheritance chain between Ci::Build and CommitStatus46177-fix-present-on-generic-commit-statusMayra Cabrera2018-05-162-25/+24
| * | Makes CommitStatus and GenericCommitStatus respond to presentableMayra Cabrera2018-05-153-0/+5
* | | Resolve "Opening Project with invite but without accepting leads to 404 error...🙈 jacopo beschi 🙉2018-05-175-2/+33
* | | Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-2/+6
|\ \ \
| * | | Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-2/+6
* | | | 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-174-5/+13
|\ \ \ \
| * | | | Add dot to separate system notes contentjivl-add-dot-system-notesJose2018-05-144-5/+13
* | | | | Merge branch 'jprovazn-remote-upload-destroy' into 'master'Kamil Trzciński2018-05-165-7/+43
|\ \ \ \ \
| * | | | | 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-165-7/+41
* | | | | | Merge branch '46010-allow-managing-group-runners-via-api' into 'master'Kamil Trzciński2018-05-164-12/+27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Refactor out duplication in runner_policy.rb46010-allow-managing-group-runners-via-apiDylan Griffith2018-05-161-4/+8
| * | | | | Change policy list_runner_jobs -> read_runnerDylan Griffith2018-05-161-1/+0
| * | | | | Rename User#ci_authorized_runners -> ci_owned_runnersDylan Griffith2018-05-163-9/+9
| * | | | | Improve efficiency of authorized_runner policy queryDylan Griffith2018-05-161-1/+1
| * | | | | Use can? policies for lib/api/runners.rbDylan Griffith2018-05-161-4/+4
| * | | | | Allow group runners to be viewed/edited in APIDylan Griffith2018-05-162-3/+15
| |/ / / /
* | | | | Merge branch 'fix/contributors-graph-width' into 'master'Mike Greiling2018-05-161-18/+36
|\ \ \ \ \
| * | | | | Use correct base widthPaul Vorbach2018-05-151-8/+22
| * | | | | Refactor duplicate codePaul Vorbach2018-05-151-6/+10
| * | | | | Use ES6 `const` more consistentlyPaul Vorbach2018-05-151-9/+6
| * | | | | Fix width of contributors graphsPaul Vorbach2018-05-151-3/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-163-10/+17
|\ \ \ \ \
| * | | | | Fix Error 500 viewing admin page due to statement timeoutsStan Hu2018-05-163-10/+17
| | |/ / / | |/| | |
* | | | | fixed copy to cliboard button in embedded snippetshaseeb2018-05-162-2/+3
* | | | | Merge branch 'osw-fix-boards-list-header-color' into 'master'Robert Speicher2018-05-162-2/+3
|\ \ \ \ \
| * | | | | Adjust board lists header text colorosw-fix-boards-list-header-colorOswaldo Ferreira2018-05-142-2/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'dz-fix-cluster-error-message' into 'master'Annabel Gray2018-05-161-1/+1
|\ \ \ \ \
| * | | | | Remove unnecessary section-100 css class from application_row.vueDmitriy Zaporozhets2018-05-161-1/+1
| * | | | | Remote table-section from div holding cluster error messagesDmitriy Zaporozhets2018-05-151-1/+1
* | | | | | Merge branch 'move-disussion-actions-to-the-right' into 'master'Tim Zallmann2018-05-164-30/+21
|\ \ \ \ \ \
| * | | | | | Reorder discussion timestamp information for issuesGeorge Tsiolis2018-05-043-7/+7
| * | | | | | Move note actions to the rightGeorge Tsiolis2018-05-011-4/+0
| * | | | | | Move discussion actions to the right for small viewportsGeorge Tsiolis2018-05-012-20/+15
* | | | | | | Project Sidebar: Split CI/CD into CI/CD and OperationsLukas Eipert2018-05-162-48/+69