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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Improve Ci config loader by changing method signaturerefactor/ci-config-add-facade	Grzegorz Bizon	2016-06-07	3	-6/+6
\|
*	Remove duplicated exception in Ci config	Grzegorz Bizon	2016-06-07	3	-7/+3
\| \| \| \| \|	This is a temporary refactoring stub, that is planned to be removed after removing legacy config processor.
*	Rename class that loads CI configuration to Loader	Grzegorz Bizon	2016-06-06	5	-23/+19
\|
*	Extract CI config YAML parser to a separate class	Grzegorz Bizon	2016-06-03	4	-5/+96
\| \| \| \| \|	With this approach it would be easier to add different sources of configuration, that we do not necessairly have to be in YAML format.
*	Add gitlab ci configuration class that holds hash	Grzegorz Bizon	2016-06-03	3	-7/+58
\| \| \| \| \| \| \| \| \|	As for now, we keep this class inside a oryginal config processor class. We will move implementation to this class and delegate to it from current config processor. After original gitlab ci yaml processor not longer has relevant impelemntation we will replace it with new configuration class.
*	Merge branch 'dz-code-tab'	Dmitriy Zaporozhets	2016-06-03	13	-54/+52
\|\ \| \| \| \| \| \|	See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4431
\| *	Update test since branch removal does not render template anymoredz-code-tab	Dmitriy Zaporozhets	2016-06-03	1	-4/+0
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Fix more tests with new Code tab	Dmitriy Zaporozhets	2016-06-03	4	-13/+15
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Update tests to match new Code tab logic	Dmitriy Zaporozhets	2016-06-03	4	-25/+26
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Put project Files and Commits tabs under Code tab	Dmitriy Zaporozhets	2016-06-03	7	-17/+16
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'dz-more-ui-guides' into 'master'	Dmitriy Zaporozhets	2016-06-03	1	-1/+21
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add icons and buttons to UI guide cc @jschatz1 @skyruler See merge request !4445
\| *	Fix typodz-more-ui-guides	Dmitriy Zaporozhets	2016-06-02	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add icons and buttons to UI guide	Dmitriy Zaporozhets	2016-06-02	1	-1/+21
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'fix/import-error-handling' into 'master'	Robert Speicher	2016-06-03	7	-14/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import error handling Fixes https://gitlab.com/gitlab-com/support-forum/issues/745 This improves import error handling: - Now if there's an error during importing before the job is scheduled, we also mark the project status as failed. - Refactored setting the status to failed into one single method. - Fixed some situations where the error message was missing or simply empty. See merge request !4366
\| * \|	Update repository_import_worker.rb	James Lopez	2016-06-02	1	-1/+1
\| \| \|
\| * \|	fix import service spec	James Lopez	2016-06-02	1	-1/+1
\| \| \|
\| * \|	added changelog	James Lopez	2016-06-02	1	-0/+1
\| \| \|
\| * \|	fix some issues and improved error output for forking	James Lopez	2016-06-02	2	-2/+9
\| \| \|
\| * \|	some refactoring and fixing spec	James Lopez	2016-06-02	3	-6/+8
\| \| \|
\| * \|	fix empty message on shell error	James Lopez	2016-06-02	1	-1/+1
\| \| \|
\| * \|	fix create service error handling - missing setting import status to failed	James Lopez	2016-06-02	1	-6/+20
\|/ /
* \|	Merge branch '18031-sidebar-labels-queries' into 'master'	Yorick Peterse	2016-06-02	4	-5/+24
\|\ \ \| \| \| \| \| \|	See merge request !4436
\| * \|	issuable#labels_array explicitly load the labels	Paco Guzman	2016-06-02	4	-5/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will be useful when you want to ask for the number of items and later iterate over them, without needing to ask if the association is load or not. So you avoid extra database queries
* \| \|	Merge branch 'rs-todo-has-tooltip' into 'master'	Dmitriy Zaporozhets	2016-06-02	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tooltips to todo target links See merge request !4370
\| * \| \|	Add tooltips to todo target linksrs-todo-has-tooltip	Robert Speicher	2016-05-30	1	-1/+3
\| \| \| \|
* \| \| \|	Update CHANGELOG for 8.8.3	Robert Speicher	2016-06-02	1	-7/+17
\| \|/ / \|/\| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'issue_18102' into 'master'	Robert Speicher	2016-06-02	1	-2/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes missing number on generated ordered list Closes #18102 See merge request !4437
\| * \| \|	Fixes missing number on generated ordered list	Alfredo Sumaran	2016-06-02	1	-2/+0
\| \| \| \|
* \| \| \|	Merge branch 'reduce-fog-deps' into 'master'	Robert Speicher	2016-06-02	3	-99/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce number of fog gem dependencies Currently supported: * AWS * Azure * OpenStack * Google * local storage Closes #15352 See merge request !4396
\| * \| \| \|	Reduce number of fog gem dependenciesreduce-fog-deps	Stan Hu	2016-06-01	3	-99/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15352
* \| \| \| \|	Merge branch 'issue-18032' into 'master'	Yorick Peterse	2016-06-02	7	-1/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache project build count. Closes #18032 See merge request !4377
\| * \| \| \| \|	Refactor. Add tests.	Josh Frye	2016-06-02	7	-17/+10
\| \| \| \| \| \|
\| * \| \| \| \|	Invalidate cache on build change	Josh Frye	2016-06-02	2	-1/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Cache project build count. Closes #18032	Josh Frye	2016-06-02	3	-0/+15
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'tests/move-shortcuts-specs-to-valid-directory' into 'master'	Robert Speicher	2016-06-02	1	-0/+0
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move feature specs for shortcuts to valid directory This MR moves tests to valid directory that matches our namespace we use in code. See merge request !4433
\| * \| \| \| \|	Move feature specs for shortcuts to valid directorytests/move-shortcuts-specs-to-valid-directory	Grzegorz Bizon	2016-06-02	1	-0/+0
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'issue-18036' into 'master'	Yorick Peterse	2016-06-02	6	-2/+62
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache assigned issue and merge request count. Closes #18036 and #18035 See merge request !4378
\| * \| \| \| \|	Update specs. Add CHANGELOG entryissue-18036	Josh Frye	2016-06-02	5	-16/+36
\| \| \| \| \| \|
\| * \| \| \| \|	Flush cache in callback. Add tests	Josh Frye	2016-06-02	3	-4/+32
\| \| \| \| \| \|
\| * \| \| \| \|	Cache assigned open issue count. Closes #18035	Josh Frye	2016-06-02	2	-3/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Cache assigned merge request count. Closes #18036	Josh Frye	2016-06-02	2	-1/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'search-box-blur' into 'master'	Jacob Schatz	2016-06-02	3	-18/+15
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clicking search pill focuses field When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field. Fixed an issue where clicking out of the field wouldn't remove the focus outline Also reduced some of the HTML to remove what isn't needed See merge request !4279
\| * \| \| \| \|	Clicking search pill focuses fieldsearch-box-blur	Phil Hughes	2016-05-24	3	-18/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field. Fixed an issue where clicking out of the field wouldn't remove the focus outline Also reduced some of the HTML to remove what isn't needed
* \| \| \| \| \|	Merge branch 'fix-inline-filter-speed' into 'master'	Stan Hu	2016-06-02	2	-4/+9
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix serious performance bug with rendering Markdown with InlineDiffFilter Nokogiri's `node.replace` was being unnecessarily called for every text node in the document due to a comparison bug. The code previously was comparing the HTML representation of the full document against the text node, which would always fail. Fix the comparison to just compare the modified text. Closes #18011 See merge request !4392
\| * \| \| \| \|	Fix serious performance bug with rendering Markdown with InlineDiffFilter	Stan Hu	2016-06-01	2	-4/+9
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nokogiri's `node.replace` was being unnecessarily called for every text node in the document due to a comparison bug. The code previously was comparing the HTML representation of the full document against the text node, which would always fail. Fix the comparison to just compare the modified text. Closes #18011
* \| \| \| \|	Merge branch '14446-no_group_avatar-png-link' into 'master'	Rémy Coutable	2016-06-02	2	-1/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to blank group icon When the group is the default blank icon, this needs to use the `image_path` helper; otherwise, the link won't work if assets are precompiled. This still works fine for uploaded icons in either case. Closes #14446. See merge request !4375
\| * \| \| \| \|	Fix link to blank group icon	Sean McGivern	2016-06-02	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the group is the default blank icon, this needs to use the `image_path` helper; otherwise, the link won't work if assets are precompiled. This still works fine for uploaded icons in either case.
* \| \| \| \| \|	Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into ↵	Rémy Coutable	2016-06-02	2	-1/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix wiki project clone address error _Note: Originally opened at !4407 by @chujinjin._ --- fix wiki project clone address error in Wiki Git Access View, show as below: ![image](/uploads/5e3bf6d1418c42862a885319c31bc3cf/image.png) Fixes #17643. See merge request !4429
\| * \| \| \| \|	Fix wiki project clone address errorchujinjin/gitlab-ce-fix_wiki_project_clone_address_error	chujinjin	2016-06-02	2	-1/+2
\| \|/ / / /
* \| \| \| \|	Merge branch 'minor_doc_updates' into 'master'	Achilleas Pipinellis	2016-06-02	2	-2/+10
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor doc updates ## What does this MR do? Adds to and clarifies some documentation. Specifically, when using `gdb` to debug you need to detach and exit when done. Next, this clarifies the type of file locking that we require. Thanks to @northrup for the details about mandatory vs. advisory file locking. Note: These were two really small changes so I combined in to one merge request. However, I left the commits separate for clarity. See merge request !4421