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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add CHANGELOGfix-github-clone-wiki	Douglas Barbosa Alexandre	2017-06-12	1	-0/+4
\|
*	Github - Fix token interpolation when cloning wiki repository	Douglas Barbosa Alexandre	2017-06-12	1	-1/+1
\|
*	Merge branch 'retry-specs' into 'master'	Robert Speicher	2017-06-12	1	-3/+2
\|\ \| \| \| \| \| \| \| \|	Attempts to run RSpec tests twice (1 retry) See merge request !12066
\| *	Attempts to run RSpec tests twice (1 retry)retry-specs	Rémy Coutable	2017-06-12	1	-3/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'fix/import-commit-status-issue' into 'master'	Douwe Maan	2017-06-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore commit status name validation on importing Closes #33490 See merge request !12039
\| * \|	ignore name validation on importingfix/import-commit-status-issue	James Lopez	2017-06-12	1	-1/+1
\| \|/
* \|	Merge branch 'use-request-store-helper-instead-actual-code' into 'master'	Douwe Maan	2017-06-12	10	-82/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use :request_store hooks on specs See merge request !12058
\| * \|	Use :request_store hooks on specsuse-request-store-helper-instead-actual-code	Oswaldo Ferreira	2017-06-09	10	-82/+20
\| \| \|
* \| \|	Merge branch 'gitlab-workhorse-2.1.1' into 'master'	Douwe Maan	2017-06-12	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-workhorse to v2.1.1 See merge request !12049
\| * \| \|	Update gitlab-workhorse to v2.1.1	Nick Thomas	2017-06-09	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-zh_TW-00' into 'master'	Douwe Maan	2017-06-12	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a few translation for zh_TW See merge request !12043
\| * \| \| \|	Fix a few translation for zh_TWfix-zh_TW-00	Lin Jen-Shin	2017-06-12	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '33525-use-git-diff-instead-of-git-format-patch' into 'master'	Robert Speicher	2017-06-12	1	-7/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate patch with git diff instead of git format-patch Closes #33525 See merge request !12060
\| * \| \| \| \|	Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patch	Rémy Coutable	2017-06-09	1	-7/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will generate a patch: - that is smaller - that applies more cleanly since only the final diff will be applied instead of each commit's diff Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'gitaly-0.11.2' into 'master'	Stan Hu	2017-06-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly 0.11.2 See merge request !12092
\| * \| \| \| \| \|	Use gitaly 0.11.2	Jacob Vosmaer	2017-06-12	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2017-06-12	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1) See merge request !12078
\| * \| \| \| \| \| \|	Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as ↵	PAB	2017-06-12	1	-2/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the upgrade fails with Go 1.5 (installed with Gitlab 8.1)
* \| \| \| \| \| \|	Merge branch 'operau2f' into 'master'	Rémy Coutable	2017-06-12	3	-1/+54
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix FIDO U2F for Opera browser (based on !10118) See merge request !12082
\| * \| \| \| \| \|	Add test for u2f helper and changelog entry	Jonas Kalderstam	2017-06-11	2	-0/+53
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Enable FIDO U2F on Opera browser, see http://caniuse.com/#feat=u2f	Jakub Kramarz	2017-06-11	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '33132-change-icon-color' into 'master'33363-user-customize-callout-has-no-top-margin-on-projects-page	Phil Hughes	2017-06-12	2	-5/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always render warnings icon in orange Closes #33132 See merge request !12061
\| * \| \| \| \| \| \|	Always render warnings icon in orange	Filipa Lacerda	2017-06-12	2	-5/+9
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'	Marin Jankovski	2017-06-12	1	-1/+10
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to gzip when missing optional zopfli dependency See merge request !12068
\| * \| \| \| \| \|	fall back to gzip when zopfli compression is unavailablefall-back-to-gzip-when-missing-optional-deps	Mike Greiling	2017-06-09	1	-1/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '33003-avatar-in-project-api' into 'master'	Rémy Coutable	2017-06-12	4	-0/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept avatar file in project API Closes #33003 See merge request !11988
\| * \| \| \| \| \| \|	Accept image for avatar in project API	vanadium23	2017-06-09	4	-0/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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