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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmes	Douglas Barbosa Alexandre	2016-01-25	2	-4/+76
\|
*	Merge branch 'rails_update' into 'master'	Valery Sizov	2016-01-25	2	-31/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails updated to 4.2.5 I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383) @dzaporozhets @yorickpeterse See merge request !2591
\| *	rails updated to 4.2.5rails_update	Valery Sizov	2016-01-25	2	-31/+31
\| \|
* \|	Merge branch 'install-unzip' into 'master'	Kamil Trzciński	2016-01-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Install unzip in build environment [ci skip] See merge request !2593
\| * \|	Install unzip in build environment [ci skip]	Kamil Trzcinski	2016-01-25	1	-1/+1
\|/ /
* \|	Merge branch 'update-gitlab-git' into 'master'	Douwe Maan	2016-01-25	3	-2/+22
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab_git & use new method for counting branches Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62 Fixes #12418 See merge request !2535
\| *	Use branch_count in Repository#has_visible_content?	Yorick Peterse	2016-01-21	2	-1/+21
\| \| \| \| \| \| \| \| \| \|	Gitlab::Git::Repository#branch_count is a tad faster than the previous setup. See gitlab-org/gitlab_git!62 for more information.
\| *	Updated gitlab_git to 7.2.24	Yorick Peterse	2016-01-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Performance of Gitlab::Git::Repository was improved in merge request gitlab-org/gitlab_git!62.
* \|	Merge branch 'doc_artifacts' into 'master'	Achilleas Pipinellis	2016-01-24	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note on artifacts browser functionality Based on the following comment: https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006 See merge request !2586
\| * \|	Add note on artifacts browser functionality	Achilleas Pipinellis	2016-01-24	1	-0/+5
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Based on the following comment: https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006 [ci skip]
* \|	Merge branch 'doc_omniauth' into 'master'	Achilleas Pipinellis	2016-01-24	1	-13/+17
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move supported omniauth providers to the top See merge request !2585
\| * \|	Move supported omniauth providers to the top	Achilleas Pipinellis	2016-01-24	1	-13/+17
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'doc_integration_imgs' into 'master'	Achilleas Pipinellis	2016-01-24	21	-14/+14
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move all integration docs images in a single directory See merge request !2584
\| * \|	Move all integration docs images in a single directory	Achilleas Pipinellis	2016-01-24	21	-14/+14
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'doc_refactor_system_hooks_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-24/+94
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor system_hooks API documentation See merge request !2475
\| * \|	Clean up system hooks API documentation	Achilleas Pipinellis	2016-01-24	1	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Remove relative linkdoc_refactor_system_hooks_api	Achilleas Pipinellis	2016-01-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It wouldn't work on doc.gitlab.com [ci skip]
\| * \|	Refactor system_hooks API documentation [ci skip]	Achilleas Pipinellis	2016-01-18	1	-23/+73
\| \| \|
* \| \|	Merge branch 'doc_refactor_namespaces_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-7/+33
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor namespaces API documentation See merge request !2472
\| * \| \|	Clean up namespaces API documentationdoc_refactor_namespaces_api	Achilleas Pipinellis	2016-01-24	1	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Refactor namespaces API documentation [ci skip]	Achilleas Pipinellis	2016-01-18	1	-7/+22
\| \|/ /
* \| \|	Merge branch 'doc_refactor_README_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-98/+157
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor README API documentation ~~Waiting for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2435 to be merged.~~ See merge request !2476
\| * \| \|	Fix typos, grammar and other styleguide issuesdoc_refactor_README_api	Achilleas Pipinellis	2016-01-18	1	-19/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Use plaintext instead of json in code blocks	Achilleas Pipinellis	2016-01-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \|	Clean-up API README [ci skip]	Achilleas Pipinellis	2016-01-18	1	-29/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix some curl examples - Fix examples for id vs iid
\| * \| \|	Merge branch 'master' into doc_refactor_README_api	Achilleas Pipinellis	2016-01-18	1	-2/+46
\| \|\ \ \
\| * \| \| \|	Refactor README API documentation [ci skip]	Achilleas Pipinellis	2016-01-18	1	-97/+147
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'doc_refactor_settings_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-44/+54
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor settings API documentation See merge request !2474
\| * \| \| \|	Refactor settings API documentation [ci skip]doc_refactor_settings_api	Achilleas Pipinellis	2016-01-18	1	-44/+54
\| \|/ / /
* \| \| \|	Merge branch 'doc_refactor_labels_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-41/+111
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor labels API documentation See merge request !2471
\| * \| \| \|	Refactor labels API documentation [ci skip]doc_refactor_labels_api	Achilleas Pipinellis	2016-01-18	1	-41/+111
\| \|/ / /
* \| \| \|	Merge branch 'doc_refactor_issues_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-144/+260
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor issues API documentation See merge request !2466
\| * \| \| \|	Refactor issues API documentationdoc_refactor_issues_api	Achilleas Pipinellis	2016-01-18	1	-144/+260
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'doc_refactor_deploy_keys_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-12/+62
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor deploy_keys API documentation See merge request !2467
\| * \| \| \|	Refactor deploy_keys API documentation [ci skip]doc_refactor_deploy_keys_api	Achilleas Pipinellis	2016-01-18	1	-12/+62
\| \|/ / /
* \| \| \|	Merge branch 'doc_refactor_branches_api' into 'master'	Achilleas Pipinellis	2016-01-24	1	-35/+73
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor branches API documentation See merge request !2464
\| * \| \| \|	Refactor branches API documentationdoc_refactor_branches_api	Achilleas Pipinellis	2016-01-18	1	-35/+73
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'rs-no-minified-js'	Robert Speicher	2016-01-23	12	-150/+9813
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't vendor minified JS Fixes #4031 See merge request !2494
\| * \| \| \|	[ci skip] Update CHANGELOGrs-no-minified-js	Douglas Barbosa Alexandre	2016-01-20	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Don't vendor minified fuzzaldrin-plus	Douglas Barbosa Alexandre	2016-01-20	3	-2/+1162
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This version was compiled to use in the browser through Browserify. More info or how to compile a new version: https://gitlab.com/dbalexandre/fuzzaldrin-plus-browserify
\| * \| \| \|	Don't vendor minified jQuery.nicescroll	Douglas Barbosa Alexandre	2016-01-20	3	-119/+3635
\| \| \| \| \|
\| * \| \| \|	Don't vendor minified g.bar.js	Douglas Barbosa Alexandre	2016-01-20	3	-9/+675
\| \| \| \| \|
\| * \| \| \|	Don't vendor minified g.raphael.js	Douglas Barbosa Alexandre	2016-01-20	3	-8/+862
\| \| \| \| \|
\| * \| \| \|	Don't vendor minified Chart.js	Robert Speicher	2016-01-20	3	-12/+3478
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The filename is titlecased because that's how it came from the vendor, and we're not touching it.
* \| \| \| \|	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"