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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Changed composer installer script in the CI PHP example docimprove-ci-example-php-doc	Jeffrey Cafferata	2017-01-26	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The script will check some php.ini settings warn you if they are set incorrectly, and then download the latest composer.phar in the current directory. These lines will, in order: - Download the installer SHA-384 to the current directory - Download the installer to the current directory - Verify the installer SHA-384 which you can also cross-check https://composer.github.io/pubkeys.html - Run the installer - Remove the installer & the installer SHA-384 Signed-off-by: Rémy Coutable <remy@rymai.me>
*	Merge branch 'patch-6' into 'master'	Rémy Coutable	2017-01-26	1	-2/+9
\|\ \| \| \| \| \| \| \| \|	add an other ldap configuration example See merge request !6773
\| *	Add more precision about LDAP configuration	David	2016-10-24	1	-23/+10
\| \|
\| *	add an other ldap configuration example	David	2016-10-10	1	-1/+21
\| \|
* \|	Merge branch 'patch-10' into 'master'	Rémy Coutable	2017-01-26	1	-0/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Added recommendation to install github-markdown See merge request !8103
\| * \	Merge branch 'patch-10' of gitlab.com:bennyp/gitlab-ce into patch-10	Benny Powers	2017-01-19	0	-0/+0
\| \|\ \
\| \| * \|	Removed duplicated content	Benny Powers	2017-01-17	1	-3/+0
\| \| \| \|
\| \| * \|	Corrected HAML markup in git_access.html.haml	Benny Powers	2017-01-17	1	-1/+7
\| \| \| \|
\| \| * \|	Added recommendation to install github-markdown	Benny Powers	2016-12-15	1	-0/+4
\| \| \| \|
\| * \| \|	Removed duplicated content	Benny Powers	2017-01-19	1	-3/+0
\| \| \| \|
\| * \| \|	Corrected HAML markup in git_access.html.haml	Benny Powers	2017-01-19	1	-1/+7
\| \| \| \|
\| * \| \|	Added recommendation to install github-markdown	Benny Powers	2017-01-19	1	-0/+4
\| \| \| \|
* \| \| \|	Merge branch 'mysql-sources-utf8mb4-fix' into 'master'	Rémy Coutable	2017-01-26	3	-7/+208
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7 See merge request !8508
\| * \| \| \|	Gitlab from sources : proper utf8mb4 support for MySQL 5.5 to 5.7	Guillaume Simon	2017-01-12	3	-7/+208
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-11' into 'master'	Rémy Coutable	2017-01-26	0	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in examples See merge request !8530
\| * \| \| \| \|	Fix typo in examples	Koen Punt	2017-01-11	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-11' into 'master'	Achilleas Pipinellis	2017-01-26	0	-0/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update enviroments.md API docs The example for deleting an environment is missing the "s" in environments See merge request !8485
\| * \| \| \| \| \|	Update enviroments.md the example for deleting an environment is missing the ↵	Kenneth Toley	2017-01-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"s" in environments. curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/environments/1" wil 404
* \| \| \| \| \| \|	Merge branch '27285-fix-broken-master' into 'master'	Sean McGivern	2017-01-26	1	-2/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure we have a project with a repo in GitlabMarkdownHelper specs Closes #27285 See merge request !8806
\| * \| \| \| \| \| \|	Ensure we have a project with a repo in GitlabMarkdownHelper specs	Rémy Coutable	2017-01-26	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'contributing-md-accepting-merge-requests' into 'master'	Rémy Coutable	2017-01-26	1	-14/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" See merge request !8802
\| * \| \| \| \| \| \| \|	Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge ↵contributing-md-accepting-merge-requests	Adam Niedzielski	2017-01-26	1	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requests" [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'rs-empty_project-lib' into 'master'	Rémy Coutable	2017-01-26	65	-103/+114
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible throughout spec/lib See merge request !8767
\| * \| \| \| \| \| \| \|	Use `:empty_project` where possible throughout spec/librs-empty_project-lib	Robert Speicher	2017-01-25	65	-103/+114
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '27178-update-builds-link-in-project-settings' into 'master'	Sean McGivern	2017-01-26	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed builds info link on project settings page Closes #27178 See merge request !8762
\| * \| \| \| \| \| \| \| \|	Remove markdown file extension and add anchor to link	Ryan Harris	2017-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fixed builds info link on project settings page	Ryan Harris	2017-01-25	2	-1/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '26068_tasklist_issue' into 'master'	Sean McGivern	2017-01-26	3	-4/+27
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don’t count tasks that are not defined as list items correctly Closes #26068 See merge request !8526
\| * \| \| \| \| \| \| \| \| \|	Don’t count tasks that are not defined as list items correctly	Jarka Kadlecova	2017-01-25	3	-4/+27
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Revert "Make sure TraceReader uses Encoding.default_external"	Lin Jen-Shin	2017-01-26	2	-15/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e9d8fc94e6e13f8b2d145f549d4a939ca25a3d93.
* \| \| \| \| \| \| \| \| \| \|	Make sure TraceReader uses Encoding.default_external	Lin Jen-Shin	2017-01-26	2	-2/+15
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Encoding.default_external was chosen over Encoding.default_internal because File.read is returning Encoding.default_external, therefore we should align with it. Alternatively, we could force both of them to be Encoding.default_internal. However, ideally this should be determined by different projects. For example, some projects might want to use an encoding different to what GitLab is using. This might not happen soon though. Closes #27052
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-empty_project-for-associations' into 'master'	Rémy Coutable	2017-01-26	18	-23/+30
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Factories with a project association use `:empty_project` by default See merge request !8770
\| * \| \| \| \| \| \| \| \| \|	Use a project factory with a repository where necessaryrs-empty_project-for-associations	Robert Speicher	2017-01-25	5	-9/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Factories with a project association use `:empty_project` by default	Robert Speicher	2017-01-24	14	-14/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-empty_project-helpers' into 'master'	Rémy Coutable	2017-01-26	14	-40/+41
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in helper specs See merge request !8796
\| * \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in helper specsrs-empty_project-helpers	Robert Speicher	2017-01-25	14	-40/+41
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-empty_project-controllers' into 'master'	Rémy Coutable	2017-01-26	43	-74/+67
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in controller specs See merge request !8797
\| * \| \| \| \| \| \| \| \| \| \|	Use `empty_project` where possible in controller specsrs-empty_project-controllers	Robert Speicher	2017-01-25	43	-74/+67
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-empty_project-finders' into 'master'	Rémy Coutable	2017-01-26	10	-23/+23
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in finder specs See merge request !8794
\| * \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in finder specsrs-empty_project-finders	Robert Speicher	2017-01-25	10	-23/+23
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '27203-fix-ruby21-broken-master' into 'master'	Rémy Coutable	2017-01-26	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use hashrocket for dasherized attribute Closes #27203 See merge request !8775
\| * \| \| \| \| \| \| \| \| \| \|	Use hashrocket for dasherized attribute27203-fix-ruby21-broken-master	Rémy Coutable	2017-01-25	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise Ruby 2.1 is not happy. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 8.16.2	DJ Mountney	2017-01-25	6	-19/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '27013-regression-in-commit-title-bar' into 'master'	Annabel Dunstone Gray	2017-01-25	4	-3/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "regression in commit title bar" Closes #27013 See merge request !8751
\| * \| \| \| \| \| \| \| \| \| \| \|	fixed points from comments to improve code quality	dimitrieh	2017-01-25	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	added changelog entry27013-regression-in-commit-title-bar	dimitrieh	2017-01-24	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fixed repo view, last commit, with updated clipboard button order	dimitrieh	2017-01-24	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fixed commit title bar	dimitrieh	2017-01-24	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2017-01-25	4	-4/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'24895-branch-index-delete-button-inconsistently-spaced-and-misaligned' into 'master' Resolve "Branch index delete button inconsistently spaced and misaligned" Closes #24895 See merge request !8646
\| * \| \| \| \| \| \| \| \| \| \| \| \|	properly center dropdown menu button in content-list context24895-branch-index-delete-button-inconsistently-spaced-and-misaligned	Mike Greiling	2017-01-23	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|