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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added limited widths to header of snippetscommit-comments-limited-width	Phil Hughes	2017-06-12	4	-3/+6
\|
*	Fixed commit/show view spec	Phil Hughes	2017-06-12	1	-2/+2
\|
*	Limit the width of commit & snippet comment sections	Phil Hughes	2017-06-12	6	-12/+17
\| \| \| \|	Closes #20920
*	Merge branch '31397-job-detail-real-time' into 'master'	Phil Hughes	2017-06-12	36	-313/+1171
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Improve Job detail view to make it refreshed in real-time instead of reloading Closes #31397, #30901, #29948, and #24339 See merge request !11848
\| *	Improve Job detail view to make it refreshed in real-time instead of reloading	Filipa Lacerda	2017-06-12	36	-313/+1171
\|/
*	Merge branch 'rs-simplify-todo-count-spec' into 'master'	Rémy Coutable	2017-06-12	4	-29/+14
\|\ \| \| \| \| \| \| \| \|	Test todos_count_format helper at the correct level to improve speed See merge request !12075
\| *	Test todos_count_format helper at the correct level to improve speedrs-simplify-todo-count-spec	Robert Speicher	2017-06-09	4	-29/+14
\| \| \| \| \| \| \| \| \| \|	Instead of an integration test that creates 101 Todo records to test a simple view helper, just unit test the helper.
* \|	Merge branch 'disable-Style/PreferredHashMethods-cop' into 'master'	Robert Speicher	2017-06-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Disable the Style/PreferredHashMethods cop See merge request !12065
\| * \|	Disable the Style/PreferredHashMethods copdisable-Style/PreferredHashMethods-cop	Rémy Coutable	2017-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'unassign-default-dropdown-state' into 'master'	Phil Hughes	2017-06-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes default text to "Unassigned" Closes #32802 See merge request !12081
\| * \| \|	Changes default text to "Unassigned"unassign-default-dropdown-state	Jacob Schatz	2017-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By changing this text the css will check for `toggle_text == default_label`. In this case they were not the same. Now they are and it will show the default label in gray.
* \| \| \|	Merge branch 'sh-recaptcha-fix-try2' into 'master'	Sean McGivern	2017-06-12	3	-1/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure reCAPTCHA configuration is loaded when spam checks are initiated Closes #33532 See merge request !12080
\| * \| \| \|	Make sure reCAPTCHA configuration is loaded when spam checks are initiatedsh-recaptcha-fix-try2	Stan Hu	2017-06-10	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously it was possible when an issue was updated and Akismet flagged it as spam that the reCAPTCHA configuration was not loaded. Closes #33532
* \| \| \| \|	Merge branch '32517-disable-hover-state' into 'master'	Phil Hughes	2017-06-12	2	-5/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show hover state on links and buttons Closes #32517 See merge request !12051
\| * \| \| \| \|	Only show hover state on links and buttons	Filipa Lacerda	2017-06-12	2	-5/+11
\|/ / / / /
* \| \| \| \|	Merge branch '31349-navs-vue' into 'master'	Phil Hughes	2017-06-12	6	-127/+133
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use vue files for navigation tabs and buttons See merge request !12040
\| * \| \| \| \|	Use vue files for navigation tabs and buttons	Filipa Lacerda	2017-06-12	6	-127/+133
\|/ / / / /
* \| \| \| \|	Merge branch 'patch-8' into 'master'	Grzegorz Bizon	2017-06-12	1	-0/+20
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc: add example of scheduler when See merge request !12067
\| * \| \| \|	doc: add example of scheduler when	Elan Ruusamäe	2017-06-12	1	-0/+20
\|/ / / /
* \| \| \|	Merge branch 'remove-dead-singular-assignee-code-in-boards' into 'master'	Fatih Acet	2017-06-10	1	-3/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Remove unused dead singular assignee code in boards See merge request !12077
\| * \| \|	Remove dead singular assignee code in boardsremove-dead-singular-assignee-code-in-boards	Eric Eastwood	2017-06-09	1	-3/+0
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/adc59353fa48c5e433b80efc1698c0b12e121968#852fdbe4145be33eca58d30d8c2f4a6623ef8602_30_30 Only usage removed in https://gitlab.com/gitlab-org/gitlab-ce/commit/de9e559d4495560095adfa03ea6489ea51f6f2f4#e22df3c6b3631af90cde45bbb974ddce72aefab7_21_21
* \| \|	Merge branch 'sh-bump-oauth2-gem' into 'master'	Robert Speicher	2017-06-09	3	-7/+11
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump Faraday and dependent OAuth2 gem version to support no_proxy variable Closes omnibus-gitlab#1714 See merge request !12074
\| * \|	Bump Faraday and dependent OAuth2 gem version to support no_proxy variable	Stan Hu	2017-06-09	3	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/omnibus-gitlab#1714
* \| \|	Merge branch '33208-singup-active-state-underline' into 'master'	Clement Ho	2017-06-09	2	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes sign up active state underline misalignment Closes #33208 See merge request !11890
\| * \| \|	Fixes sign up active state underline misalignment	Frank Sierra	2017-06-09	2	-0/+6
\|/ / /
* \| \|	Merge branch 'bugfix/upgrade-ruby-parser' into 'master'	Douwe Maan	2017-06-09	2	-4/+4
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Bugfix/upgrade ruby parser See merge request !11861
\| * \|	ruby 2.4 support: upgrade ruby_parser to 3.9bugfix/upgrade-ruby-parser	http://jneen.net/	2017-06-09	2	-4/+4
\| \| \|
* \| \|	Merge branch '33469-focus' into 'master'	Annabel Dunstone Gray	2017-06-09	2	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove outline from More Actions icon when dropdown open Closes #33469 See merge request !12054
\| * \| \|	remove outline from dropdown toggles when dropdown open33469-focus	Simon Knox	2017-06-10	2	-1/+5
\| \| \| \|
* \| \| \|	Merge branch 'dm-mail-room-check-without-omnibus' into 'master'	Robert Speicher	2017-06-09	2	-5/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't check if MailRoom is running on Omnibus Closes #19607 See merge request !12056
\| * \| \| \|	Don't check if MailRoom is running on Omnibusdm-mail-room-check-without-omnibus	Douwe Maan	2017-06-09	2	-5/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'cache-diff-size-limits' into 'master'	Douwe Maan	2017-06-09	1	-2/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only look up diff size limit flags once per request See merge request !12048
\| * \| \| \| \|	Only look up diff size limit flags once per requestcache-diff-size-limits	Sean McGivern	2017-06-09	1	-2/+18
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'bvl-revert-regenerating-translations' into 'master'	Douwe Maan	2017-06-09	14	-3109/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Regenerate po and js files" See merge request !12044
\| * \| \| \| \| \|	Recover last working spanish translationbvl-revert-regenerating-translations	Bob Van Landuyt	2017-06-09	2	-69/+591
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Mention the cause of missing translations in the docs	Bob Van Landuyt	2017-06-09	1	-0/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Revert "Regenerate po and js files"	Bob Van Landuyt	2017-06-09	13	-3109/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9157c300b78314e04857c66dacdc732a8193d278.
* \| \| \| \| \| \|	Merge branch 'dm-revert-mr-8427'	Douwe Maan	2017-06-09	28	-720/+24
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Revert 'New file from interface on existing branch'dm-revert-mr-8427	Douwe Maan	2017-06-09	28	-720/+24
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '32622-fix-markdown_preview_spec' into 'master'	Robert Speicher	2017-06-09	1	-1/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure wiki is created before we visit the Wiki page Closes #32622 See merge request !12059
\| * \| \| \| \| \| \|	Ensure wiki is created before we visit the Wiki page32622-fix-markdown_preview_spec	Rémy Coutable	2017-06-09	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	:facepalm: Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-06-09	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33457-features-project-source-markdown_render-feature-fails-on-master' into 'master' Fix intermittent Spinach markdown render failure Closes #33457 See merge request !12053
\| * \| \| \| \| \| \|	Fix intermittent Spinach markdown render failure33457-features-project-source-markdown_render-feature-fails-on-master	Sean McGivern	2017-06-09	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When loading a tree with a README.md, we need to wait for the blob viewer.
* \| \| \| \| \| \| \|	Merge branch 'tc-link-to-commit-on-help-page' into 'master'	Robert Speicher	2017-06-09	4	-3/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the revision on the `/help` page clickable See merge request !12016
\| * \| \| \| \| \| \| \|	Make the revision on the `/help` page clickabletc-link-to-commit-on-help-page	Toon Claes	2017-06-09	4	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For quicker access, add hyperlink to the gitlab.com commits page for the current REVISION of GitLab.
* \| \| \| \| \| \| \| \|	Merge branch 'dturner/grammar' into 'master'	Rémy Coutable	2017-06-09	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the grammar of the API docs See merge request !11863
\| * \| \| \| \| \| \| \| \|	Improve the grammar of the API docs	David Turner	2017-06-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-17' into 'master'	Rémy Coutable	2017-06-09	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix syntax error that breaks link to permissions document. See merge request !11968
\| * \| \| \| \| \| \| \| \| \|	Fix syntax error that breaks link to permissions document.	Sascha Reynolds	2017-06-09	1	-2/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'clarify-transferring-project' into 'master'	Rémy Coutable	2017-06-09	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify transferring project, specify permissions See merge request !11934