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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use configured git rather than system gituse-configured-git	Robert Schilling	2017-01-05	5	-14/+14
\|
*	Merge branch 'rs-absorb-gitlab_git' into 'master'	Douwe Maan	2017-01-05	38	-12/+6622
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Absorb gitlab_git Closes #24374 See merge request !8447
\| *	Ensure internal Gitlab::Git references use the namespacers-absorb-gitlab_git	Robert Speicher	2017-01-04	7	-27/+27
\| \|
\| *	Absorb gitlab_git	Robert Speicher	2017-01-04	38	-12/+6622
\| \|
* \|	Merge branch 'ux-guide-search-box' into 'master'	Achilleas Pipinellis	2017-01-05	3	-0/+13
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	UX Guide: add section on search box See merge request !8429
\| * \|	[ci skip] UX Guide: add section on search boxux-guide-search-box	Allison Whilden	2017-01-03	3	-0/+13
\| \| \|
* \| \|	Merge branch 'ux-guide-text-color' into 'master'	Achilleas Pipinellis	2017-01-05	3	-0/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UX Guide: Add new primary and secondary text colors See merge request !8449
\| * \| \|	[ci skip] UX Guide: Add new primary and secondary text colorsux-guide-text-color	Allison Whilden	2017-01-04	3	-0/+7
\| \| \| \|
* \| \| \|	Merge branch 'monkey-patch-comment' into 'master'	Rémy Coutable	2017-01-05	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explain why we have this monkey-patch See merge request !8329
\| * \| \| \|	Explain why there is a monkey-patch	Jacob Vosmaer	2016-12-27	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-404-slack-error' into 'master'	Kamil Trzciński	2017-01-05	2	-36/+64
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API route slack slash commands Closes #25954 See merge request !8362
\| * \| \| \|	Add API route slack slash commandszj-404-slack-error	Z.J. van de Weg	2017-01-03	2	-36/+64
\| \| \| \| \|
* \| \| \| \|	Merge branch '26278-shaking-tab-pipelines-view' into 'master'	Fatih Acet	2017-01-04	2	-2/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes invalid html and unneeded CSS to prevent shaking in the pipelines tab Closes #26278 See merge request !8411
\| * \| \| \| \|	Removes invalid html and unneed CSS to prevent shaking in the pipelines tab26278-shaking-tab-pipelines-view	Filipa Lacerda	2017-01-03	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates CHANGELOG entry with MR ID
* \| \| \| \| \|	Merge branch 'terminal-fix' into 'master'	Jacob Schatz	2017-01-04	3	-0/+3350
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Terminal: Add TextEncoder and TextDecoder in terminal bundle. Closes #25977 See merge request !8450
\| * \| \| \| \|	Terminal: Add TextEncoder and TextDecoder in terminal bundle.	Fatih Acet	2017-01-04	3	-0/+3350
\|/ / / / /
* \| \| \| \|	Merge branch 'rs-fix-implicit-div' into 'master' 25725-remove-window-object	Robert Speicher	2017-01-04	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ImplicitDiv Haml lint failure See merge request !8441
\| * \| \| \| \|	Fix ImplicitDiv Haml lint failure	Robert Speicher	2017-01-04	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'mrchrisw-repack-not-gc' into 'master'	Jacob Vosmaer (GitLab)	2017-01-04	1	-7/+19
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify git housekeeping See merge request !8373
\| * \| \| \| \|	Clarify git housekeepingmrchrisw-repack-not-gc	Chris Wilson	2016-12-30	1	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changed in https://gitlab.com/gitlab-org/gitlab-ce/commit/6bcc52a53678ca68001189c801497862d3f6e758 The current docs are not clear in stating that we also run a `git repack` and that we respect the admin application setting values.
* \| \| \| \| \|	Merge branch 'recaptcha_500' into 'master'	Rémy Coutable	2017-01-04	3	-23/+57
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly handle failed reCAPTCHA on user registration See merge request !8403
\| * \| \| \| \| \|	Properly handle failed reCAPTCHA on user registration	Drew Blessing	2017-01-03	3	-23/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a user presses the 'Register' button too quickly after attempting to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the user would experience a 500 error. Now, the case is properly handled and the user will be sent back to the registration page with a clear error message and can try again.
* \| \| \| \| \| \|	Merge branch 'add_email_password_confirmation' into 'master'	Douwe Maan	2017-01-04	6	-18/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add email confirmation field to registration form Closes #3053 See merge request !7432
\| * \| \| \| \| \| \|	Add email and password confirmation fields to registration form	Drew Blessing	2017-01-03	6	-18/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's too easy to mistype an email or password when signing up. The support team is receiving an increasing number of requests because users mistype their email. We can eliminate this problem by requiring users to confirm the email before registering. The same issue can occur for the password field so we should add this, too. We should note that password confirmation is part of the default Devise forms. I don't know why/when GitLab removed it.
* \| \| \| \| \| \| \|	Merge branch 'rs-remove-unused-method' into 'master'	Douwe Maan	2017-01-04	2	-12/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused `Project#web_url_without_protocol` method See merge request !8416
\| * \| \| \| \| \| \| \|	Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-method	Robert Speicher	2017-01-03	2	-12/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'review-commits-and-commit-scss' into 'master'	Jacob Schatz	2017-01-04	16	-290/+261
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Review commits and commit scss See merge request !8010
\| * \| \| \| \| \| \| \| \|	Remove double border from compare pagereview-commits-and-commit-scss	Annabel Dunstone Gray	2016-12-29	1	-0/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update file hader styles; remove and relocate more commits css	Annabel Dunstone Gray	2016-12-29	11	-172/+119
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add table styling to commits tables	Annabel Dunstone Gray	2016-12-29	5	-41/+68
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Start commits refactor	Annabel Dunstone Gray	2016-12-29	5	-173/+161
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'api-refactor-issues-filter' into 'master'	Sean McGivern	2017-01-04	1	-21/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor issues filter in API See merge request !8432
\| * \| \| \| \| \| \| \| \| \|	Add missing milestone parameter	Robert Schilling	2017-01-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor issues filter in API	Robert Schilling	2017-01-04	1	-21/+7
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'api-hooks-changelog-entry' into 'master'	Sean McGivern	2017-01-04	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add changelog entry for renaming API param See merge request !8433
\| * \| \| \| \| \| \| \| \| \|	Add changelog entry for renaming API param [ci skip]	Robert Schilling	2017-01-04	1	-0/+4
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-api-project-hooks-params' into 'master'	Sean McGivern	2017-01-04	2	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project hooks params Closes #26291 See merge request !8425
\| * \| \| \| \| \| \| \| \|	Fix project hooks paramsfix-api-project-hooks-params	Robert Schilling	2017-01-03	2	-3/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmine	Robert Speicher	2017-01-03	3	-2/+65
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::LDAP::Person uses LDAP attributes configuration Closes #26290 See merge request !8418
\| * \| \| \| \| \| \| \| \|	Gitlab::LDAP::Person uses LDAP attributes configuration	Drew Blessing	2017-01-03	3	-2/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We allow users to configure LDAP attribute preferences. For example, email can be configured to use `mail`, `email` and `userPrincipalName`, falling through to the next until a value is found. Prior to this change, Gitlab::LDAP::Person did not honor this configuration. Now, the class will honor `name` and `mail` configuration. It does not handle `username`, or fallback to `first_name` + `last_name` in the absence of `name`.
* \| \| \| \| \| \| \| \| \|	Merge branch '25580-trucate-dropdown-for-long-branch' into 'master'	Fatih Acet	2017-01-03	4	-8/+42
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves overflow of dropdown text for long branch name Closes #25580 See merge request !8118
\| * \| \| \| \| \| \| \| \| \|	fixes js lint warnings25580-trucate-dropdown-for-long-branch	Nur Rony	2016-12-31	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	changelog entry added	Nur Rony	2016-12-31	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	trucates text to prevent overflow and adds tooltip to it	Nur Rony	2016-12-31	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fixes mobile views	Nur Rony	2016-12-31	1	-4/+27
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2017-01-03	3	-2/+51
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version' into 'master' Resolve changing "from" version in diff comparison does not preserve "to" version Closes #25836 See merge request !8328
\| * \| \| \| \| \| \| \| \| \| \|	Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version	Sam Rose	2016-12-31	3	-2/+51
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch '25964-label-autocomplete-doesn-t-handle-spaces-after' into ↵	Fatih Acet	2017-01-03	1	-8/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Label autocomplete doesn't handle spaces after `~~`" Closes #25964, #22058, and #23578 See merge request !8254
\| * \| \| \| \| \| \| \| \| \| \|	Remove unneeded prevention code25964-label-autocomplete-doesn-t-handle-spaces-after	Luke "Jared" Bennett	2016-12-27	1	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fixes #22058 and #23578	Yann Gravrand	2016-12-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|