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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update web editor documentationweb_editor	Achilleas Pipinellis	2016-02-10	17	-16/+110
\| \| \| \| \|	Based on https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/1045 [ci skip]
*	Merge branch 'doc_relative_url' into 'master'	Achilleas Pipinellis	2016-02-10	2	-0/+131
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation on relative URL support closes #12773 See merge request !2770
\| *	Fix typos and grammar	Achilleas Pipinellis	2016-02-10	2	-9/+8
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Add note on using a custom init scriptdoc_relative_url	Achilleas Pipinellis	2016-02-09	1	-1/+5
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Add relative URL documentation	Achilleas Pipinellis	2016-02-09	2	-0/+128
\| \|
* \|	Merge branch 'update-install-documentation-8.5' into 'master'	Yorick Peterse	2016-02-10	2	-2/+108
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated install/update guides for 8.5 See merge request !2766
\| * \|	Updated install/update guides for 8.5	Yorick Peterse	2016-02-10	2	-2/+108
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'variables-build-log' into 'master'	Robert Speicher	2016-02-09	1	-1/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
\| * \| \|	Add information about expose of build variables.variables-build-log	Kamil Trzcinski	2016-02-09	1	-1/+4
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-02-09	2	-2/+17
\|\ \ \ \
\| * \ \ \	Merge branch 'ci-permissions' into 'master'	Robert Speicher	2016-02-08	2	-2/+17
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
\| \| * \ \ \	Merge branch 'master' into ci-permissions	Kamil Trzcinski	2016-02-05	5	-26/+52
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \| \| \|	Merge remote-tracking branch 'origin/master' into ci-permissions	Kamil Trzcinski	2016-02-04	15	-65/+156
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/builds/index.html.haml
\| \| * \| \| \| \|	Rename allow_guest_to_access_builds to public_builds	Kamil Trzcinski	2016-02-04	1	-5/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Expose allow_guest_to_access_builds in GitLab API	Kamil Trzcinski	2016-02-04	1	-2/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add CI setting: allow_guest_to_access_builds	Kamil Trzcinski	2016-02-02	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
* \| \| \| \| \| \|	Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'	Douwe Maan	2016-02-09	1	-11/+115
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose MergeRequest#merge_status _Originally opened at !2478 by @develop7._ - - - This enables API users to see whether a merge request can be merged without conflicts. See merge request !2756
\| * \| \| \| \| \| \|	Add an API spec for MergeRequest#merge_status and properly document this ↵develop7/add-merge_status-to-merge-request-in-api	Rémy Coutable	2016-02-08	1	-11/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	resource
* \| \| \| \| \| \| \|	Merge branch '3kami3/gitlab-ce-root_email' into 'master'	Douwe Maan	2016-02-09	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an option to supply root email through an environmental variable. _Originally opened at !2499 by @3kami3._ --- Add an option to supply root email through an environmental variable. See merge request !2751
\| * \| \| \| \| \| \|	Add an option to supply root email through an environmental variable.3kami3/gitlab-ce-root_email	3kami3	2016-02-08	1	-2/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Fix grammar in installation requirements.	Paul Johnson	2016-02-08	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13274
* \| \| \| \| \|	Merge branch 'jira_when_ce' into 'master'	Achilleas Pipinellis	2016-02-07	1	-0/+9
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify when JIRA service was backported to CE See merge request !2744
\| * \| \| \| \|	Clarify when JIRA service was backported to CE	Achilleas Pipinellis	2016-02-08	1	-0/+9
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'markdown_help' into 'master'	Achilleas Pipinellis	2016-02-07	1	-4/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change logo image name in markdown documentation Closes #13233 See merge request !2743
\| * \| \| \|	Change logo image name in markdown documentation	Achilleas Pipinellis	2016-02-07	1	-4/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-02-06	1	-2/+19
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed Windows commands in SSH Help. The current commands shown don't work in Command Line, or PowerShell. Command Line doesn't recognize the `~` character as the home directory, the `<` character is reserved in PowerShell, and `cat` doesn't work in Command Line. This commit provides commands that will work for both the Command Line, and PowerShell. See merge request !2694
\| * \| \|	Fixed Window's commands for SSH Help.	Aaron Power	2016-02-06	1	-2/+19
\| \| \|/ \| \|/\|
* \| \|	Make sure the public/uploads/ directory is created	Achilleas Pipinellis	2016-02-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'ruby_sha' into 'master'	Achilleas Pipinellis	2016-02-05	2	-1/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Ruby SHA in installation guide The Ruby SHA that we were checking against in the installation guide was wrong. I replaced it with sha256sum which is also present in the Ruby downloads page. Also added it as a note in the doc styleguide. See merge request !2726
\| * \| \|	Add ruby version update info in doc_styleguide	Achilleas Pipinellis	2016-02-05	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Fix wrong Ruby SHA and replace with sha256sum	Achilleas Pipinellis	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'doc_refactor_session_api' into 'master'	Achilleas Pipinellis	2016-02-05	1	-17/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor session API documentation See merge request !2473
\| * \| \| \|	Refactor session API documentation [ci skip]doc_refactor_session_api	Achilleas Pipinellis	2016-01-18	1	-17/+25
\| \| \| \| \|
* \| \| \| \|	Merge branch 'doc_refactor_deploy_key_multiple_projects_api' into 'master'	Achilleas Pipinellis	2016-02-05	1	-7/+11
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor deploy_key_multiple_projects API documentation See merge request !2468
\| * \| \| \|	Refactor deploy_key_multiple_projects API documentation [ci skip]doc_refactor_deploy_key_multiple_projects_api	Achilleas Pipinellis	2016-01-18	1	-7/+11
\| \|/ / /
* \| \| \|	fix documentation bug / typo	Eric L Frederich	2016-02-04	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Merge branch 'fix-build-artifacts-doc' into 'master'	Achilleas Pipinellis	2016-02-03	1	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup artifacts section in Docs - Added Note that artifact collection is only done for successful builds. - Cleaned up Windows Support and Version notes. See merge request !2619
\| * \| \|	Documentation cleanup of artifacts section in Gitlab CI Readme	Malte Blättermann	2016-02-02	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added notice about build artifacts not beeing collected on failed builds. - Removed "introduced in 0.7.0" for artifacts section. - Made windows notice more precise
* \| \| \|	Merge branch 'improve-environment-variables-doc' into 'master'	Rémy Coutable	2016-02-03	1	-37/+42
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improving the "Environment variables" administration doc Closes #12829. /cc @sytses See merge request !2669
\| * \| \| \|	Unicorn worker killer is not Omnibus specific	Achilleas Pipinellis	2016-02-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Clean up environment variables doc	Achilleas Pipinellis	2016-02-03	1	-30/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Improving the "Environment variables" administration docimprove-environment-variables-doc	Rémy Coutable	2016-02-01	1	-30/+30
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'update_doc' into 'master'	Achilleas Pipinellis	2016-02-03	6	-22/+67
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update OAuth doc See merge request !2589
\| * \| \| \|	Refactor OAuth provider documentationupdate_doc	Achilleas Pipinellis	2016-02-03	6	-22/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	update OAuth doc	Valery Sizov	2016-01-25	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'aral/gitlab-ce-master' into 'master'	Achilleas Pipinellis	2016-02-03	1	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added note: working copy changes should be stashed before update process Originally proposed by @aral in !1043. Added note: working copy changes (e.g., deleted vendor folder) should be stashed before beginning the update process. We should probably include this notice on all update guides. See merge request !2668
\| * \| \| \| \|	Added note: working copy changes (e.g., deleted vendor folder) should be ↵aral/gitlab-ce-master	Aral Balkan	2016-02-01	1	-0/+6
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stashed before beginning the update process. We should probably include this notice on all update guides. [ci skip]
* \| \| \| \|	Merge branch 'support-akismet' into 'master'	Robert Speicher	2016-02-03	3	-0/+31
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
\| * \| \| \|	Support Akismet spam checking for creation of issues via API	Stan Hu	2016-02-02	3	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* \| \| \| \|	Merge branch 'git-raw-workhorse' into 'master'	Jacob Vosmaer	2016-02-02	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Send raw Git blobs via gitlab-workhorse See merge request !2451