summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Remove .form-inline from compare branch pageAnnabel Dunstone Gray2018-05-181-1/+1
|
* Fix color of input border and disabled input bg colorAnnabel Dunstone Gray2018-05-171-0/+2
|
* fix terms specClement Ho2018-05-174-6/+6
|
* Merge branch 'master' into bootstrap4Clement Ho2018-05-1723-60/+175
|\
| * Resolve "Opening Project with invite but without accepting leads to 404 ↵🙈 jacopo beschi 🙉2018-05-175-2/+33
| | | | | | | | error page"
| * Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-2/+6
| |\ | | | | | | | | | | | | | | | | | | Workhorse to send raw diff and patch for commits Closes gitaly#1196 See merge request gitlab-org/gitlab-ce!18974
| | * Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, this was done through unicorn. In theory this could time out. Workhorse has been sending these raw patches and diffs for a long time and is stable in doing so. Added bonus is the fact that `Commit#to_patch` can be removed. `Commit#to_diff` too, which closes https://gitlab.com/gitlab-org/gitaly/issues/324 Closes https://gitlab.com/gitlab-org/gitaly/issues/1196
| * | Merge branch 'remove-css-imports' into 'master'Phil Hughes2018-05-172-4/+0
| |\ \ | | | | | | | | | | | | | | | | Remove unneccessary imports See merge request gitlab-org/gitlab-ce!18993
| | * | 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 content Closes #45676 See merge request gitlab-org/gitlab-ce!18864
| | * | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete remote uploads Closes #45425 See merge request gitlab-org/gitlab-ce!18698
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | destroy_all loads all records at once
| | * | | | Delete remote uploadsJan Provaznik2018-05-165-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObjectStore uploader requires presence of associated `uploads` record when deleting the upload file (through the carrierwave's after_commit hook) because we keep info whether file is LOCAL or REMOTE in `upload` object. For this reason we can not destroy uploads as "dependent: :destroy" hook because these would be deleted too soon. Instead we rely on carrierwave's hook to destroy `uploads` in after_commit hook. But in before_destroy hook we still have to delete not-mounted uploads (which don't use carrierwave's destroy hook). This has to be done in before_Destroy instead of after_commit because `FileUpload` requires existence of model's object on destroy action. This is not ideal state of things, in a next step we should investigate how to unify model dependencies so we can use same workflow for all uploads. Related to #45425
| * | | | | Merge branch '46010-allow-managing-group-runners-via-api' into 'master'Kamil Trzciński2018-05-164-12/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | API support + Improved policies for group runners Closes #45894 and #38979 See merge request gitlab-org/gitlab-ce!18851
| | * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix contributors graph width Closes #22647 See merge request gitlab-org/gitlab-ce!18639
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contributors graphs were sized with the full .content width in mind, but at some point GitLab changed to a more narrow design, so graphs would be too wide for their container divs. This change resizes contributors graphs relative to their correct container widths.
| * | | | | Merge branch 'sh-fast-admin-counts' into 'master'Yorick Peterse2018-05-163-10/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 viewing admin page due to statement timeouts Closes #46255 See merge request gitlab-org/gitlab-ce!18982
| | * | | | | Fix Error 500 viewing admin page due to statement timeoutsStan Hu2018-05-163-10/+17
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses PostgreSQL tuple estimates to provide a much faster yet approximate count. See https://wiki.postgresql.org/wiki/Slow_Counting for more details. We only use this fast method if the table has been analyzed or vacuumed within the last hour. Closes #46255
* | | | | | Fix alert background colorsAnnabel Dunstone Gray2018-05-161-5/+7
| | | | | |
* | | | | | Merge branch 'master' into bootstrap4Clement Ho2018-05-1643-415/+500
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 color Closes #36983 See merge request gitlab-org/gitlab-ce!18955
| | * | | | | Adjust board lists header text colorosw-fix-boards-list-header-colorOswaldo Ferreira2018-05-142-2/+3
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Adjusts regression fixed by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18786/. We were not returning the label text color correctly on the backend.
| * | | | | Merge branch 'dz-fix-cluster-error-message' into 'master'Annabel Gray2018-05-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove table-section from div holding cluster error messages See merge request gitlab-org/gitlab-ce!18971
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move discussion and notes actions to the right Closes #33645 See merge request gitlab-org/gitlab-ce!18476
| | * | | | | | 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
| | | | | | | |
| * | | | | | | Remove docker pull prefix from registry clipboard featureLars Greiss2018-05-162-11/+2
| | |_|_|/ / / | |/| | | | |
| * | | | | | Fix bug with long strings in issue boardsPaul Slaughter2018-05-152-3/+17
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch '45584-add-nip-io-domain-suggestion-in-auto-devops' into 'master'Grzegorz Bizon2018-05-153-1/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add nip.io domain suggestion in the Kubernetes cluster details view" Closes #45584 See merge request gitlab-org/gitlab-ce!18496
| | * | | | Display help text below auto devops domain with nip.io domain name (#45561)45584-add-nip-io-domain-suggestion-in-auto-devopsDylan Griffith2018-05-153-1/+13
| | | | | |
| * | | | | Merge branch ↵Rémy Coutable2018-05-151-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46361-does-not-log-failed-sign-in-attempts-when-the-database-is-in-read-only-mode' into 'master' Does not log failed sign-in attempts when the database is in read-only mode Closes #46361 See merge request gitlab-org/gitlab-ce!18957
| | * | | | | Does not log failed sign-in attempts when database is in read-only modeDouglas Barbosa Alexandre2018-05-141-0/+3
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-151-13/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Spinach Closes #23036 See merge request gitlab-org/gitlab-ce!18869
View Lorry Controller Status