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	1	-4/+12
\|
*	Merge branch 'update-gitlab-git' into 'master'	Douwe Maan	2016-01-25	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	Gitlab::Git::Repository#branch_count is a tad faster than the previous setup. See gitlab-org/gitlab_git!62 for more information.
* \|	Merge branch 'rs-no-minified-js'	Robert Speicher	2016-01-23	1	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't vendor minified JS Fixes #4031 See merge request !2494
\| * \|	Don't vendor minified fuzzaldrin-plus	Douglas Barbosa Alexandre	2016-01-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \|
\| * \|	Don't vendor minified g.bar.js	Douglas Barbosa Alexandre	2016-01-20	1	-1/+1
\| \| \|
\| * \|	Don't vendor minified g.raphael.js	Douglas Barbosa Alexandre	2016-01-20	1	-1/+1
\| \| \|
\| * \|	Don't vendor minified Chart.js	Robert Speicher	2016-01-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The filename is titlecased because that's how it came from the vendor, and we're not touching it.
* \| \|	Merge branch 'ignore-binary-files-in-git-grep' into 'master'	Dmitriy Zaporozhets	2016-01-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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>
* \| \| \| \|	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 '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	4	-0/+81
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport some changes from EE See merge request !2548
\| * \| \| \| \|	Backport some changes from EEes_backport	Valery Sizov	2016-01-22	4	-0/+81
\| \|/ / / /
* \| \| \| \|	Merge branch 'fix-comment-on-diff-ajax-loading'	Dmitriy Zaporozhets	2016-01-22	6	-52/+69
\|\ \ \ \ \
\| * \| \| \| \|	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	25	-34/+126
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|	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	2	-37/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	More highlighted diff fixes See merge request !2545
\| * \| \| \| \| \|	Restore diff comments	Douwe Maan	2016-01-22	1	-1/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'unescaped-diffs' into 'master'	Robert Speicher	2016-01-22	2	-3/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure non-highlighted diffs are still escaped Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12521 See merge request !2544
\| * \| \| \| \| \|	Make sure non-highlighted diffs are still escapedunescaped-diffs	Douwe Maan	2016-01-22	2	-3/+9
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'ci/recursive-artifacts-entries' into 'master'	Robert Speicher	2016-01-21	2	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-5/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'diff-highlight-themes' into 'master'	Robert Speicher	2016-01-21	21	-268/+237
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Diff highlight themes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12484 See merge request !2530
\| * \| \| \| \| \|	Make dark inline diffs a little more obviousdiff-highlight-themes	Douwe Maan	2016-01-21	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Pretty highlighted diffs for every theme	Douwe Maan	2016-01-21	5	-20/+37
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use consistent markup and styling for highlighting across blobs, diffs, ↵	Douwe Maan	2016-01-21	21	-260/+212
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blame and snippets
* \| \| \| \| \|	Merge branch 'drag-drop-cursor' into 'master'	Jacob Schatz	2016-01-21	1	-0/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestone drag & drop cursor Fixes #4097 ![grab-cursor](/uploads/f5071d7e4839c3b4b88c9f7f1270eee3/grab-cursor.gif) cc @jschatz1 @creamzy See merge request !2532
\| * \| \| \| \| \|	Milestone drag & drop cursor	Phil Hughes	2016-01-21	1	-0/+11
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4097
* \| \| \| \| \|	Merge branch 'fix/artifacts-download-progress-bar' into 'master'	Grzegorz Bizon	2016-01-21	3	-10/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not use progress bar when downloading build artifacts Closes #12491 See merge request !2531
\| * \| \| \| \| \|	Move build artifacts javascripts into separate filefix/artifacts-download-progress-bar	Grzegorz Bizon	2016-01-21	3	-13/+16
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Do not use progress bar when downloading build artifacts	Grzegorz Bizon	2016-01-21	1	-1/+5
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12491
* \| \| \| \| \|	remove execution permissions from fonts	Pirate Praveen	2016-01-21	25	-0/+0
\|/ / / / /
* \| \| \| \|	Removes 100% width because it is a block element.	Jacob Schatz	2016-01-20	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Implement new UI for pagination	Dmitriy Zaporozhets	2016-01-20	7	-53/+28
\| \| \| \| \|
* \| \| \| \|	Merge branch 'ui-is-broken-in-search-result-page' into 'master'	Dmitriy Zaporozhets	2016-01-21	1	-4/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix term height so text overflap does not happen. Fixes #12449 Height was set on the `.term`. It made the text overlap. See merge request !2518
\| * \| \| \| \|	Fix term height so text overflap does not happen.ui-is-broken-in-search-result-page	Jacob Schatz	2016-01-20	1	-4/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-project-creation' into 'master'	Robert Speicher	2016-01-20	2	-2/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Creator should be added as a master of the project on creation Fixes #4222 This also enable a project creator to add themselves as a master of the project for existing repositories that were created in the meanwhile that they don't appear as members. See merge request !2520