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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into ↵fix-git-hooks-when-creating-file	Lin Jen-Shin	2017-02-02	426	-2058/+4651
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix-git-hooks-when-creating-file * upstream/master: (190 commits) Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Fix small typo on new branch button spec Improve styling of the new issue message Don't capitalize environment name in show page Abillity to promote project labels to group labels Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. 19164 Add settings dropdown to mobile screens cop for gem fetched from a git source Add CHANGELOG entry ...
\| *	Merge branch 'empty-selection-reply-shortcut' into 'master'	Clement Ho	2017-02-01	4	-25/+38
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Change the reply shortcut to focus the field even without a selection. See merge request !8873
\| \| *	Remove unnecessary returns / unset variables from the CoffeeScript -> JS ↵	Brian Hall	2017-02-01	1	-25/+22
\| \| \| \| \| \| \| \| \| \| \| \|	conversion.
\| \| *	Change the reply shortcut to focus the field even without a selection.	Brian Hall	2017-01-31	4	-5/+21
\| \| \|
\| * \|	Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master'	Robert Speicher	2017-02-01	3	-29/+82
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms Closes #24462 See merge request !8752
\| \| * \|	Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms	Drew Blessing	2017-01-30	3	-29/+82
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We accept half a dozen different authentication mechanisms for Git over HTTP. Fairly high in the list we were checking user password, which would also query LDAP. In the case of LFS, OAuth tokens or personal access tokens, we were unnecessarily hitting LDAP when the authentication will not succeed. This was causing some LDAP/AD systems to lock the account. Now, user password authentication is the last mechanism tried since it's the most expensive.
\| * \|	Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' ↵	Filipa Lacerda	2017-02-01	0	-0/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix permalink discussion note being collapsed Closes #26860, #27089, and #27151 See merge request !8773
\| * \ \	Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' ↵	Filipa Lacerda	2017-02-01	0	-0/+0
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix permalink discussion note being collapsed Closes #26860, #27089, and #27151 See merge request !8773
\| * \| \|	Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' ↵	Filipa Lacerda	2017-02-01	3	-10/+49
\| \|\ \ \ \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix permalink discussion note being collapsed Closes #26860, #27089, and #27151 See merge request !8773
\| \| * \|	Fix permalink discussion note being collapsed27089-26860-27151-fix-discussion-note-permalink-collapsed	Eric Eastwood	2017-01-26	3	-10/+49
\| \| \| \|
\| * \| \|	Merge branch 'fix-filtering-username-with-multiple-words' into 'master'	Filipa Lacerda	2017-02-01	3	-1/+52
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filtering usernames with multiple words Closes #27404 See merge request !8851
\| \| * \| \|	Fix filtering usernames with multiple wordsfix-filtering-username-with-multiple-words	Clement Ho	2017-01-27	3	-1/+52
\| \| \| \| \|
\| * \| \| \|	Merge branch '27494-environment-list-column-headers' into 'master'	Annabel Dunstone Gray	2017-02-01	3	-2/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited the column header for the environments list from created to updated and a… Closes #27494 See merge request !8904
\| \| * \| \| \|	Edited the column header for the environments list from created to updated ↵27494-environment-list-column-headers	dimitrieh	2017-01-31	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and added created to environments detail page colum header titles
\| * \| \| \| \|	Merge branch 'zj-format-chat-messages' into 'master'	Kamil Trzciński	2017-02-01	28	-261/+679
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Format chat messages Closes #24917 and #25746 See merge request !8528
\| \| * \| \| \| \|	Improve styling of the new issue messagezj-format-chat-messages	Z.J. van de Weg	2017-01-31	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Incorporate feedback	Z.J. van de Weg	2017-01-30	9	-18/+49
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'zj-format-chat-messages' of gitlab.com:gitlab-org/gitlab-ce ↵	Z.J. van de Weg	2017-01-30	0	-0/+0
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into zj-format-chat-messages
\| \| \| * \ \ \ \	Merge branch 'master' into 'zj-format-chat-messages'	Zeger-Jan van de Weg	2017-01-26	482	-1309/+4453
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/gitlab/chat_commands/command_spec.rb
\| \| \| * \| \| \| \| \|	Rename presenters for consitency	Z.J. van de Weg	2017-01-26	15	-36/+51
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Incorporate feedback	Z.J. van de Weg	2017-01-24	19	-189/+565
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Fix tests	Z.J. van de Weg	2017-01-24	1	-6/+2
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Add help command	Z.J. van de Weg	2017-01-24	3	-8/+53
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Revert removing of some files	Z.J. van de Weg	2017-01-24	5	-0/+221
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Chat Commands have presenters	Z.J. van de Weg	2017-01-24	32	-758/+476
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This improves the styling and readability of the code. This is supported by both Mattermost and Slack.
\| \| * \| \| \| \| \| \|	Rename presenters for consitency	Z.J. van de Weg	2017-01-30	16	-40/+51
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Incorporate feedback	Z.J. van de Weg	2017-01-30	19	-189/+565
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix tests	Z.J. van de Weg	2017-01-30	1	-6/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add help command	Z.J. van de Weg	2017-01-30	3	-8/+53
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Revert removing of some files	Z.J. van de Weg	2017-01-30	3	-0/+167
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Chat Commands have presenters	Z.J. van de Weg	2017-01-30	29	-687/+479
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This improves the styling and readability of the code. This is supported by both Mattermost and Slack.
\| * \| \| \| \| \| \| \|	Merge branch 'fix/import-user-validation-error' into 'master'	Rémy Coutable	2017-01-31	3	-0/+30
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix user validation error in Import/Export Closes #23833 See merge request !8909
\| \| * \| \| \| \| \| \| \|	update specfix/import-user-validation-error	James Lopez	2017-01-31	1	-6/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	use destroy_all	James Lopez	2017-01-31	1	-3/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	add changelog	James Lopez	2017-01-31	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	remove old project members from project	James Lopez	2017-01-31	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	add spec replicating validation error	James Lopez	2017-01-31	1	-0/+28
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch '27484-environment-show-name' into 'master'	Fatih Acet	2017-01-31	4	-2/+10
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't capitalize environment name in show page Closes #27484 See merge request !8902
\| \| * \| \| \| \| \| \| \| \|	Don't capitalize environment name in show page27484-environment-show-name	Filipa Lacerda	2017-01-31	4	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upate test to match the new behavior
\| * \| \| \| \| \| \| \| \| \|	Merge branch '19164-mobile-settings' into 'master'	Annabel Dunstone Gray	2017-01-31	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
\| * \ \ \ \ \ \ \ \ \ \	Merge branch '19164-mobile-settings' into 'master'	Annabel Dunstone Gray	2017-01-31	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '19164-mobile-settings' into 'master'	Annabel Dunstone Gray	2017-01-31	3	-5/+12
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
\| \| * \| \| \| \| \| \| \| \| \|	Remove settings cog from within admin scroll tabs; keep links centered19164-mobile-settings	Annabel Dunstone Gray	2017-01-31	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	19164 Add settings dropdown to mobile screens	tauriedavis	2017-01-30	2	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '26982-improve-pipeline-status-icon-linking-in-widgets' into ↵	Annabel Dunstone Gray	2017-01-31	5	-5/+17
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Improve pipeline status icon linking in widgets Closes #26982 See merge request !8705
\| \| * \| \| \| \| \| \| \| \| \| \|	Link to pipeline page from commit widget26982-improve-pipeline-status-icon-linking-in-widgets	Annabel Dunstone Gray	2017-01-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove underline style for icon hover	Annabel Dunstone Gray	2017-01-30	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Improve pipeline status icon linking in widgets	dimitrieh	2017-01-23	4	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch '8-16-3-patch-changelog' into 'master'	DJ Mountney	2017-01-31	9	-32/+11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the 8-16-3 changelog entries to master See merge request !8912
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'dev/master'	DJ Mountney	2017-01-31	9	-32/+11
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / /