delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Return '/' as a bogus repo path to gitlab-shellzj-internal-repo-path	Jacob Vosmaer	2018-05-25	2	-5/+9
\|
*	Don't pass the repository path to Gitlab Shell	Zeger-Jan van de Weg	2018-05-17	3	-13/+7
\| \| \| \|	This isn't a requirement, and removes deprecated method calls
*	Merge branch '42531-open-invite-404' into 'master'	Douwe Maan	2018-05-17	9	-15/+157
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Opening Project with invite but without accepting leads to 404 error page" Closes #42531 See merge request gitlab-org/gitlab-ce!17634
\| *	Resolve "Opening Project with invite but without accepting leads to 404 ↵	🙈 jacopo beschi 🙉	2018-05-17	9	-15/+157
\|/ \| \| \|	error page"
*	Merge branch 'ce-5980-add-ce-upgrade-ee-test' into 'master'	Douwe Maan	2018-05-17	5	-22/+25
\|\ \| \| \| \| \| \| \| \|	CE: Add jobs to verify that migrating from CE to EE works See merge request gitlab-org/gitlab-ce!18909
\| *	Grant privileges after database is createdce-5980-add-ce-upgrade-ee-test	Lin Jen-Shin	2018-05-16	5	-16/+14
\| \| \| \| \| \| \| \|	Never drop the database when granting privileges
\| *	Only setup db in the first checkout!	Lin Jen-Shin	2018-05-16	3	-6/+11
\| \|
* \|	Merge branch 'zj-workhorse-commit-patch-diff' into 'master'	Grzegorz Bizon	2018-05-17	6	-70/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 commits	Zeger-Jan van de Weg	2018-05-16	6	-70/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 Hughes	2018-05-17	2	-4/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneccessary imports See merge request gitlab-org/gitlab-ce!18993
\| * \| \|	Remove unneccessary importsremove-css-imports	Annabel Dunstone Gray	2018-05-16	2	-4/+0
\| \| \| \|
* \| \| \|	Merge branch 'jivl-add-dot-system-notes' into 'master'	Phil Hughes	2018-05-17	5	-5/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-notes	Jose	2018-05-14	5	-5/+18
\| \| \| \| \|
* \| \| \| \|	Merge branch 'jprovazn-remote-upload-destroy' into 'master'	Kamil Trzciński	2018-05-16	13	-11/+109
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete remote uploads Closes #45425 See merge request gitlab-org/gitlab-ce!18698
\| * \| \| \| \|	Whitelisted query limits for group destroy APIjprovazn-remote-upload-destroy	Jan Provaznik	2018-05-16	2	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fixed typo	Jan Provaznik	2018-05-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Changed order of include	Jan Provaznik	2018-05-16	4	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Use find_in_batches instead of destroy_all	Jan Provaznik	2018-05-16	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	destroy_all loads all records at once
\| * \| \| \| \|	Delete remote uploads	Jan Provaznik	2018-05-16	11	-11/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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ński	2018-05-16	10	-97/+120
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-api	Dylan Griffith	2018-05-16	1	-4/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unnecessary runner.is_shared? checks in api because they are handled ↵	Dylan Griffith	2018-05-16	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	by policy
\| * \| \| \| \|	Allow admin to assign shared runner to project through API	Dylan Griffith	2018-05-16	2	-2/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Change policy list_runner_jobs -> read_runner	Dylan Griffith	2018-05-16	2	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Rename User#ci_authorized_runners -> ci_owned_runners	Dylan Griffith	2018-05-16	6	-18/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Improve efficiency of authorized_runner policy query	Dylan Griffith	2018-05-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Use can? policies for lib/api/runners.rb	Dylan Griffith	2018-05-16	2	-13/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Allow group runners to be viewed/edited in API	Dylan Griffith	2018-05-16	7	-70/+87
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/contributors-graph-width' into 'master'	Mike Greiling	2018-05-16	2	-18/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix contributors graph width Closes #22647 See merge request gitlab-org/gitlab-ce!18639
\| * \| \| \| \| \|	Use correct base width	Paul Vorbach	2018-05-15	1	-8/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Refactor duplicate code	Paul Vorbach	2018-05-15	1	-6/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog entry for contrib graphs width fix	Paul Vorbach	2018-05-15	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use ES6 `const` more consistently	Paul Vorbach	2018-05-15	1	-9/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix width of contributors graphs	Paul Vorbach	2018-05-15	1	-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 Peterse	2018-05-16	5	-10/+127
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 timeouts	Stan Hu	2018-05-16	5	-10/+127
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \| \|	Merge branch '46303_copy_button_fix_embedded_snippets' into 'master'	Clement Ho	2018-05-16	3	-2/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed copy to cliboard button in embedded snippets Closes #46303 See merge request gitlab-org/gitlab-ce!18923
\| * \| \| \| \| \| \| \|	fixed copy to cliboard button in embedded snippets	haseeb	2018-05-16	3	-2/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'osw-fix-boards-list-header-color' into 'master'	Robert Speicher	2018-05-16	3	-2/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-color	Oswaldo Ferreira	2018-05-14	3	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 Gray	2018-05-16	1	-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.vue	Dmitriy Zaporozhets	2018-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remote table-section from div holding cluster error messages	Dmitriy Zaporozhets	2018-05-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-license' into 'master'	Rémy Coutable	2018-05-16	2	-6/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	edit GitLab license info in regards to CC licensing See merge request gitlab-org/gitlab-ce!18981
\| * \| \| \| \| \| \| \| \|	edit GitLab license info in regards to CC licensing	Andrea Kao	2018-05-15	2	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitHub uses a library called Licensee to identify a project's license type. It shows this information in the status bar and via the API if it can unambiguously identify the license. This commit moves the reference to Creative Commons licensing from the LICENSE file to the README, which allows Licensee to successfully identify the license type of GitLab CE as MIT. Signed-off-by: Andrea Kao <eirinikos@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'move-disussion-actions-to-the-right' into 'master'	Tim Zallmann	2018-05-16	5	-30/+26
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move discussion and notes actions to the right Closes #33645 See merge request gitlab-org/gitlab-ce!18476
\| * \| \| \| \| \| \| \| \| \|	Reorder discussion timestamp information for issues	George Tsiolis	2018-05-04	3	-7/+7
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move note actions to the right	George Tsiolis	2018-05-01	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move discussion actions to the right for small viewports	George Tsiolis	2018-05-01	3	-20/+20
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-metrics-doorkeeper' into 'master'	Nick Thomas	2018-05-16	2	-4/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitLab Performance Monitoring content types for Doorkeeper Closes #46412 See merge request gitlab-org/gitlab-ce!18984