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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-ci-permissions' into 'master'	Dmitriy Zaporozhets	2015-09-22	3	-42/+45
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CI permissions ![Screen_Shot_2015-09-21_at_20.23.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6f40699507d0dce148d0054a093f0d63/Screen_Shot_2015-09-21_at_20.23.16.png) This fixes two problems: - Allow developers to retry builds - Hide advanced project options from CI page for non-admin users See merge request !1379
\| *	Update CHANGELOGfix-ci-permissions	Kamil Trzcinski	2015-09-21	1	-0/+2
\| \|
\| *	Fix permissions problems	Kamil Trzcinski	2015-09-21	2	-42/+43
\| \| \| \| \| \| \| \| \| \|	- Allow developers to retry builds - Hide advanced project options from CI page for non-admin users
* \|	Merge branch 'fix-ci-migration-docs' into 'master'	Marin Jankovski	2015-09-22	2	-26/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing rake and change nginx config for CI migration /cc @marin See merge request !1385
\| * \|	Add missing rake and change nginx config for CI migration	Kamil Trzcinski	2015-09-22	2	-26/+2
\|/ /
* \|	Merge branch 'rs-ci-migration-guide' into 'master'	Robert Speicher	2015-09-22	1	-220/+264
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reformat and copy edit the CI-to-CE migration guide [ci skip] See merge request !1335
\| * \|	Add note about automatically re-enabling CI during migrate taskrs-ci-migration-guide	Robert Speicher	2015-09-21	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Remove unintended linebreak	Robert Speicher	2015-09-21	1	-2/+2
\| \| \|
\| * \|	Be consistent about "only required for manual install" notes	Robert Speicher	2015-09-21	1	-5/+8
\| \| \|
\| * \|	More migration guide updates	Robert Speicher	2015-09-21	1	-34/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Rename "Finishing Up" to "Nginx configuration" - Add fourth "Finishing Up" section - Add Troubleshooting section with a link to backup restoration docs - Change a few indented blocks into fenced blocks so they're highlighted properly. - Added Marin's suggestions for CI-to-CE-on-different-server section.
\| * \|	Whitespace	Robert Speicher	2015-09-21	1	-14/+14
\| \| \|
\| * \|	Add commands for Omnibus installation	Kamil Trzcinski	2015-09-21	1	-11/+62
\| \| \|
\| * \|	Update guide	Kamil Trzcinski	2015-09-21	1	-19/+32
\| \| \|
\| * \|	More migration guide updates	Robert Speicher	2015-09-20	1	-28/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a few links and typos, and reorganizes the CI "Create a backup" section.
\| * \|	Update migration guide	Kamil Trzcinski	2015-09-20	1	-130/+22
\| \| \|
\| * \|	Redcarpet didn't like unordered lists deeply nested in an ordered one	Robert Speicher	2015-09-17	1	-41/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't really like making these an ordered list since they're mutually exclusive, but I think the structure is what's important. [ci skip]
\| * \|	Fix link to "create a database dump" header	Robert Speicher	2015-09-17	1	-1/+1
\| \| \|
\| * \|	Indent database dump steps one more level	Robert Speicher	2015-09-17	1	-39/+39
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Reformat and copy edit the CI-to-CE migration guide	Robert Speicher	2015-09-17	1	-187/+231
\| \| \|
* \| \|	Merge branch 'tweak-more-css-for-md-preview' into 'master'	Robert Speicher	2015-09-22	3	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tweak remaining CSS for Markdown preview See merge request !1383
\| * \| \|	Tweak remaining CSS for Markdown preview	Stan Hu	2015-09-21	3	-3/+3
\|/ / / \| \| \| \| \| \| \| \| \|	Missed a few items in !1378
* \| \|	Merge branch 'rs-fix-spec-warnings' into 'master'	Robert Speicher	2015-09-21	4	-4/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure raise_error expectations provide arguments See merge request !1381
\| * \| \|	Ensure raise_error expectations provide argumentsrs-fix-spec-warnings	Robert Speicher	2015-09-21	4	-4/+8
\| \| \| \|
* \| \| \|	Merge branch 'fix-issue-2593' into 'master'	Robert Speicher	2015-09-21	3	-5/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when comparing non-existing branches Closes #2593 See merge request !1355
\| * \| \| \|	Fix Error 500 when comparing non-existing branchesfix-issue-2593	Stan Hu	2015-09-18	3	-5/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2593
* \| \| \| \|	Merge branch 'fix-dangling-milestone-ids' into 'master'	Stan Hu	2015-09-21	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deleted milestones from merge requests This is related to !1348 but thought it would be useful as a separate MR. This MR removes deleted milestone IDs from any merge request. Closes https://github.com/gitlabhq/gitlabhq/issues/9643 See merge request !1350
\| * \| \| \| \|	Remove deleted milestones from merge requests	Stan Hu	2015-09-21	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9643
* \| \| \| \| \|	Merge branch 'rs-relative-link-up-one' into 'master'	Robert Speicher	2015-09-21	2	-15/+51
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow relative links to go up one directory level See merge request !1352
\| * \| \| \| \|	Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-one	Robert Speicher	2015-09-20	2	-2/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Allow relative links to go up one directory level	Robert Speicher	2015-09-18	2	-15/+44
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rename-reply-by-email' into 'master'	Robert Speicher	2015-09-21	17	-175/+150
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
\| * \| \| \| \| \|	Tweak textrename-reply-by-email	Douwe Maan	2015-09-21	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \|	Merge branch 'master' into rename-reply-by-email	Douwe Maan	2015-09-21	20	-84/+266
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Rename reply_by_email to incoming_email to prepare for the future.	Douwe Maan	2015-09-21	17	-175/+151
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ci-import-improvements' into 'master'	Kamil Trzciński	2015-09-21	2	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI import improvements See merge request !1369
\| * \| \| \| \| \| \| \|	Relax CI version check during importci-import-improvements	Jacob Vosmaer	2015-09-21	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make importing builds less noisy	Jacob Vosmaer	2015-09-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-ci-handling' into 'master'	Dmitriy Zaporozhets	2015-09-21	2	-3/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed MR handling when GitLab CI project is not present This is copy of !1371 /cc @jacobvosmaer @vsizov @dzaporozhets See merge request !1373
\| * \| \| \| \| \| \| \|	Fixed MR handling when GitLab CI project is not presentfix-ci-handling	Kamil Trzcinski	2015-09-21	2	-3/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-note-edit-preview-css' into 'master'	Robert Speicher	2015-09-21	4	-3/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More tweaks to make note edit/preview CSS consistent Closes #2585 See merge request !1378
\| * \| \| \| \| \| \| \| \|	More tweaks to make note edit/preview CSS consistent	Stan Hu	2015-09-21	4	-3/+7
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2585
* \| \| \| \| \| \| \| \|	Merge branch 'fix-mr-without-refs' into 'master'	Dmitriy Zaporozhets	2015-09-21	2	-1/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch merge request ref if it is missing when visit MR page This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Needed for 8.0 Fixes #2580 See merge request !1377
\| * \| \| \| \| \| \| \| \|	Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refs	Dmitriy Zaporozhets	2015-09-21	2	-1/+20
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will fix merge problem for merge requests between forks created before 8.0 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Fix grammar	Sytse Sijbrandij	2015-09-21	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-milestone-destroy-in-mr' into 'master'	Dmitriy Zaporozhets	2015-09-21	3	-0/+12
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove milestones from merge requests when milestones are deleted Destroying a milestone does not remove it from existing merge requests. This MR fixes that. Requires f4816372 to pull in as well. Reported by https://github.com/gitlabhq/gitlabhq/issues/9643 See merge request !1348
\| * \| \| \| \| \| \| \| \|	Remove milestones from merge requests when milestones are deleted	Stan Hu	2015-09-21	3	-0/+12
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
* \| \| \| \| \| \| \| \|	Merge branch 'repo-size-link' into 'master'	Dmitriy Zaporozhets	2015-09-21	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link project repo size to files See merge request !1374
\| * \| \| \| \| \| \| \| \|	Link project repo size to filesrepo-size-link	Douwe Maan	2015-09-21	2	-3/+3
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-project-panel-ci-button' into 'master'	Dmitriy Zaporozhets	2015-09-21	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove CI button from project home panel Since we already have a "Continuous Integration" item in the sidebar now, I don't think we need "CI" on the project page. See merge request !1372
\| * \| \| \| \| \| \| \| \|	Remove CI button from project home panelremove-project-panel-ci-button	Douwe Maan	2015-09-21	1	-4/+0
\| \|/ / / / / / / /