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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix UI for pages with panelsfix-ui-padding	Dmitriy Zaporozhets	2016-01-22	11	-31/+16
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'speed-up-builds' into 'master'	Kamil Trzciński	2016-01-22	3	-28/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed-up docker based builds This adds: - Bundler cache - APT cache - PhantomJS cache It should reduce the time needed for container to prepare docker-based build environment. See merge request !2567
\| *	Speed-up docker based buildsspeed-up-builds	Kamil Trzcinski	2016-01-22	3	-28/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable to: - Use APT cache - Use Bundler cache - Use PhantomJS cache
* \|	Merge branch 'issue_2239' into 'master'	Dmitriy Zaporozhets	2016-01-22	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide a link for fetching merge requests from command line instructions Closes #2239 See merge request !2540
\| * \|	Add link for checkout MRs info.issue_2239	Rubén Dávila	2016-01-21	1	-0/+4
\| \| \|
* \| \|	Merge branch 'solarized-dark-old-lines' into 'master'	Robert Speicher	2016-01-22	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make deleted line background color for Solarized Dark a little darker The difference is very slight, and I don't even _use_ Solarized Dark, but this annoyed me. See merge request !2563
\| * \| \|	Make old line background color for Solarized Dark a little more clearsolarized-dark-old-lines	Douwe Maan	2016-01-22	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'es_backport' into 'master'	Dmitriy Zaporozhets	2016-01-22	5	-80/+83
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport some changes from EE See merge request !2548
\| * \| \| \|	Backport some changes from EEes_backport	Valery Sizov	2016-01-22	5	-80/+83
\| \| \| \| \|
* \| \| \| \|	Fix changelog	Dmitriy Zaporozhets	2016-01-22	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'fix-comment-on-diff-ajax-loading'	Dmitriy Zaporozhets	2016-01-22	11	-59/+120
\|\ \ \ \ \
\| * \| \| \| \|	Fix failing specsfix-comment-on-diff-ajax-loading	Rémy Coutable	2016-01-21	2	-7/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Fix indentation of methods chaining in Coffee	Rémy Coutable	2016-01-20	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Rémy Coutable	2016-01-20	59	-76/+634
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix-comment-on-diff-ajax-loading
\| * \| \| \| \| \|	Address some JS coding-style and HTML semantic issues	Rémy Coutable	2016-01-20	5	-32/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Replace 'rel' attributes with 'data' or 'id' attributes - Style jQuery methods chaining according to Jacob's guidelines - Rename a method
\| * \| \| \| \| \|	Fix diff comments loaded by AJAX to load comment with diff in discussion tab	Rémy Coutable	2016-01-19	5	-37/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commits also fixes two minor issues: - Ensure notes that the current user is not allowed to see are not returned in the AJAX notes loading - Ensure the notes counter badge is decremented of 1 instead of 2
* \| \| \| \| \| \|	Merge branch 'fix-error-500-mr-search' into 'master'	Dmitriy Zaporozhets	2016-01-22	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when doing a search for merge requests Potential fix for #11547 See merge request !2525
\| * \| \| \| \| \|	Fix Error 500 when doing a search for merge requests	Stan Hu	2016-01-20	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Potential fix for #11547
* \| \| \| \| \|	Merge branch 'mysql-password-ci' into 'master'	Kamil Trzciński	2016-01-22	1	-1/+10
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow empty Mysql password on CI [ci skip] See merge request !2558
\| * \| \| \| \|	More docker stuff in gitlab-ci.yml	Jacob Vosmaer	2016-01-22	1	-4/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Allow empty Mysql password on CImysql-password-ci	Jacob Vosmaer	2016-01-22	1	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-01-22	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GitLab 8.4 uses gitlab-shell v2.6.10 While upgrading to GitLab 8.3 to 8.4 there was a warning massage for using GitLab 8.3 with gitlab-shell v2.6.9 so I changed gitlab-shell version to v2.6.10 and it worked. See merge request !2555
\| * \| \| \| \| \|	GitLab 8.4 uses gitlab-shell v2.6.10	Julian Rademacher	2016-01-22	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'doc_codeblock_fix' into 'master'	Achilleas Pipinellis	2016-01-22	1	-29/+34
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken codeblocks in ci/yaml documentation See merge request !2554
\| * \| \| \| \|	Fix broken codeblocks in ci/yaml documentation	Achilleas Pipinellis	2016-01-22	1	-29/+34
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'changelog_master' into 'master'	Marin Jankovski	2016-01-22	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove 8.4 unreleased note from changelog See merge request !2553
\| * \| \| \| \|	Remove 8.4 unreleased note from changelog	Achilleas Pipinellis	2016-01-22	1	-1/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'fix_build_artifacts_doc' into 'master'	Achilleas Pipinellis	2016-01-22	1	-5/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wording and appearance on build artifacts documentation See merge request !2550
\| * \| \| \| \|	Fix wording and appearance on build artifacts documentation	Achilleas Pipinellis	2016-01-22	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'minor_fix_2fa_security' into 'master'	Achilleas Pipinellis	2016-01-22	2	-4/+11
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add image to 2fa security documentation See merge request !2549
\| * \| \| \| \|	Add image to 2fa security documentation	Achilleas Pipinellis	2016-01-22	2	-4/+11
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'doc_refactor_commits_api' into 'master'	Achilleas Pipinellis	2016-01-22	2	-84/+188
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor commits API documentation Blocked by https://gitlab.com/gitlab-org/gitlab-ce/issues/10960 which needs to be fixed or documented. Closes #4217 See merge request !2465
\| * \| \| \| \|	Add note about commit status API deprecation	Achilleas Pipinellis	2016-01-22	2	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Merge branch 'master' into doc_refactor_commits_api	Achilleas Pipinellis	2016-01-22	211	-829/+3254
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue/spelling' into 'master'	Achilleas Pipinellis	2016-01-22	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a missing letter in the documentation. Hello, I just found a missing letter in the PHP CI configuration documentation. This MR allow to fix that :smile: See merge request !2519
\| * \| \| \| \|	Fix a missing letter in the documentation.	Stéphane HULARD	2016-01-20	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-mr-diff-edit-button' into 'master'	Robert Speicher	2016-01-22	4	-29/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542
\| * \| \| \| \| \|	Fix MR diff 'Edit' buttonfix-mr-diff-edit-button	Douwe Maan	2016-01-21	4	-29/+27
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-diff-comments' into 'master'	Robert Speicher	2016-01-22	3	-6/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More highlighted diff fixes See merge request !2545
\| * \| \| \| \| \| \|	Properly highlight right side of parallel difffix-diff-comments	Douwe Maan	2016-01-22	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Restore diff comments	Douwe Maan	2016-01-22	2	-5/+7
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'file_finder_doc_fixes' into 'master'	Achilleas Pipinellis	2016-01-22	1	-6/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar and typos in file finder docs See merge request !2547
\| * \| \| \| \| \| \|	Fix grammar and typos in file finder docs	Achilleas Pipinellis	2016-01-22	1	-6/+7
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'unescaped-diffs' into 'master'	Robert Speicher	2016-01-22	3	-8/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
\| * \| \| \| \| \| \|	Fix	Douwe Maan	2016-01-22	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make sure non-highlighted diffs are still escapedunescaped-diffs	Douwe Maan	2016-01-22	3	-8/+20
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix_file_finder' into 'master'	Achilleas Pipinellis	2016-01-21	1	-5/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File finder can be invoked from anywhere! See merge request !2543
\| * \| \| \| \| \| \|	File finder can be invoked from anywhere!	Achilleas Pipinellis	2016-01-22	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'ci/recursive-artifacts-entries' into 'master'	Robert Speicher	2016-01-21	7	-19/+46
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add method to calculate total size of artifacts in subpath See merge request !2500
\| * \| \| \| \| \| \| \|	Add method that calculates total size for artifacts subfolderci/recursive-artifacts-entries	Kamil Trzcinski	2016-01-20	7	-19/+46
\| \| \| \| \| \| \| \| \|