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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update wording for 2FA requirement noticers-2fa-requirement-wording	Robert Speicher	2016-01-23	2	-7/+7
\|
*	Merge branch 'raw_abbr' into 'master'	Robert Speicher	2016-01-23	3	-0/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Whitelist raw "abbr" elements when parsing Markdown See #12517. See merge request !2559
\| *	Whitelist raw "abbr" elements when parsing Markdown	Benedict Etzel	2016-01-23	3	-0/+10
\| \| \| \| \| \| \| \|	Closes #12517
* \|	Merge branch 'forcefully-install-apt-packages' into 'master'	Kamil Trzciński	2016-01-23	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Forcefully install apt packages See merge request !2577
\| *	Forcefully install apt packages	Kamil Trzcinski	2016-01-23	1	-1/+1
\|/
*	Merge branch 'ignore-binary-files-in-git-grep' into 'master'	Dmitriy Zaporozhets	2016-01-23	2	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore binary files in code search to prevent Error 500 Leaving out the -I option in "git grep" would cause an Error 500 because the resulting line would include "Binary file X matches", which would cause the project search results to crash with the following error: ``` ActionView::Template::Error (wrong argument type nil (expected Regexp)): 1: - blob = @project.repository.parse_search_result(blob) 2: .blob-result 3: .file-holder 4: .file-title app/models/repository.rb:742:in `sub' app/models/repository.rb:742:in `block in parse_search_result_from_grep' app/models/repository.rb:741:in `each_line' app/models/repository.rb:741:in `parse_search_result_from_grep' app/models/repository.rb:682:in `parse_search_result' app/views/search/results/_blob.html.haml:1:in `_app_views_search_results__blob_html_haml__1959871337755590783_162450160' app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__2198486911700532411_58329920' app/views/search/show.html.haml:7:in `_app_views_search_show_html_haml___1698304427272645201_62235300' ``` See merge request !2565
\| *	Ignore binary files in code search to prevent Error 500	Stan Hu	2016-01-22	2	-1/+2
\| \| \| \| \| \| \| \| \| \|	Leaving out the -I option in "git grep" would cause an Error 500 because the resulting line would include "Binary file X matches"
* \|	Merge branch 'housekeeping_doc' into 'master'	Achilleas Pipinellis	2016-01-23	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make git gc man page more apparent See merge request !2557
\| * \|	Make git gc man page more apparenthousekeeping_doc	Achilleas Pipinellis	2016-01-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'issuable-white-bg' into 'master'	Jacob Schatz	2016-01-23	6	-14/+17
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gray background from issue/mr/milestone background Fixes #6062 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler @creamzy See merge request !2573
\| * \| \|	Remove gray background from issue/mr/milestone backgroundissuable-white-bg	Dmitriy Zaporozhets	2016-01-22	6	-14/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'fix-ui-padding' into 'master'	Jacob Schatz	2016-01-23	11	-31/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UI for pages with panels Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler @creamzy Fixes #12633 See merge request !2571
\| * \| \| \|	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 'patch-1' into 'master'	Achilleas Pipinellis	2016-01-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor spelling, prob typo See merge request !2564
\| * \| \| \|	Minor spelling, prob typo	Mark Nordine	2016-01-22	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'name-azure-in-general-readme' into 'master'	Achilleas Pipinellis	2016-01-22	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Name more OmniAuth providers in the general readme. See merge request !2566
\| * \| \| \|	Name more OmniAuth providers in the general readme.name-azure-in-general-readme	Sytse Sijbrandij	2016-01-22	1	-1/+1
\| \|/ / /
* \| \| \|	Merge branch 'dont-use-prod-namespace' into 'master'	Robert Speicher	2016-01-22	1	-3/+3
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use production section for Gemfile Related to !2485 See merge request !2570
\| * \| \|	Don't use production section for Gemfile	Dmitriy Zaporozhets	2016-01-22	1	-3/+3
\|/ / / \| \| \| \| \| \| \| \| \|	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