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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into button-focus-statebutton-focus-state	Fatih Acet	2016-06-06	33	-220/+717
\|\
\| *	Merge branch 'jquery2' into 'master'	Jacob Schatz	2016-06-06	4	-6/+7
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgraded jQuery to version 2 ## What does this MR do? Upgrades jQuery to 2.2.1. Had to include the task_list JS file directly as it includes jQuery 1 directly https://github.com/github-archive/task_list/blob/master/app/assets/javascripts/task_list.coffee#L8 so when we change jQuery to `jquery2` it was including both jQuery 1 & 2. ## Are there points in the code the reviewer needs to double check? For any JS errors ## What are the relevant issue numbers? Closes #12440 See merge request !4384
\| \| *	Fixed JS errorsjquery2	Phil Hughes	2016-06-05	3	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \|	CHANGELOG item
\| \| *	Upgraded jQuery to version 2	Phil Hughes	2016-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #12440
\| * \|	Implement authentication (login) using a U2F device.	Timothy Andrew	2016-06-06	1	-0/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move the `authenticate_with_two_factor` method from `ApplicationController` to the `AuthenticatesWithTwoFactor` module, where it should be.
\| * \|	Implement U2F registration.	Timothy Andrew	2016-06-06	4	-0/+93
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move the `TwoFactorAuthsController`'s `new` action to `show`, since the page is not used to create a single "two factor auth" anymore. We can have a single 2FA authenticator app, along with any number of U2F devices, in any combination, so the page will be accessed after the first "two factor auth" is created. - Add the `u2f` javascript library, which provides an API to the browser's U2F implementation. - Add tests for the JS components
\| *	Address feedback	Alfredo Sumaran	2016-06-03	3	-14/+13
\| \|
\| *	Enhancements	Alfredo Sumaran	2016-06-03	3	-16/+13
\| \|
\| *	Fix spec	Alfredo Sumaran	2016-06-03	1	-1/+1
\| \|
\| *	Add mising params	Alfredo Sumaran	2016-06-03	1	-3/+6
\| \|
\| *	Remove console.log	Alfredo Sumaran	2016-06-03	1	-1/+0
\| \|
\| *	Bulk assignment implementation	Alfredo Sumaran	2016-06-03	2	-0/+109
\| \|
\| *	Tweaks for bulk assignment	Alfredo Sumaran	2016-06-03	1	-3/+15
\| \|
\| *	Do not trigger keyup event if we are persisting state	Alfredo Sumaran	2016-06-03	1	-3/+8
\| \| \| \| \| \| \| \|	Triggering keyup will re-render the dropdown which is not needed when option persistWhenHide is true
\| *	Remove unneeded call to keyup event	Alfredo Sumaran	2016-06-03	1	-3/+0
\| \| \| \| \| \| \| \|	This was re-rendering the dropdown unnecessarily
\| *	Only filter asynchronously if option remote is true.	Alfredo Sumaran	2016-06-03	1	-11/+11
\| \| \| \| \| \| \| \|	We need to update the results right away when we do bulk assignment.
\| *	Restore dropdown state when unchecking all issues	Alfredo Sumaran	2016-06-03	1	-0/+14
\| \|
\| *	Add space	Alfredo Sumaran	2016-06-03	1	-1/+1
\| \|
\| *	Do not remove inputs when dropdown menu hides	Alfredo Sumaran	2016-06-03	1	-1/+0
\| \|
\| *	Remove console.log	Alfredo Sumaran	2016-06-03	1	-1/+0
\| \|
\| *	Handle unchecking of indeterminate items	Alfredo Sumaran	2016-06-03	2	-11/+30
\| \|
\| *	Update classname for indeterminate state	Alfredo Sumaran	2016-06-03	2	-3/+3
\| \|
\| *	typo	Alfredo Sumaran	2016-06-03	3	-18/+13
\| \|
\| *	Set indeterminated items	Alfredo Sumaran	2016-06-03	3	-5/+52
\| \|
\| *	Remove unnecesary assignment	Alfredo Sumaran	2016-06-03	1	-1/+0
\| \|
\| *	Ability to assign a label to multiple issues	Alfredo Sumaran	2016-06-03	1	-0/+4
\| \|
\| *	Merge branch 'remove-unnecessary-prefixes' into 'master'	Jacob Schatz	2016-06-03	3	-16/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary vendor prefixes for browsers we no longer support. Pretty simple, just removes a few prefixed properties for browsers we don't support. See merge request !4368
\| \| *	Remove unnecessary vendor prefixes for browsers we no longer support.	Connor Shea	2016-05-30	3	-16/+1
\| \| \|
\| * \|	Fixed issue with search autocomplete not allow arrow key navigation	Phil Hughes	2016-06-03	2	-11/+19
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #15649
\| * \|	Merge branch 'master' into awardablesawardables	Z.J. van de Weg	2016-06-03	15	-27/+89
\| \|\ \
\| \| * \	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 'search-box-blur' into 'master'	Jacob Schatz	2016-06-02	2	-13/+13
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \|	Attempt to fix the user page.	Connor Shea	2016-06-01	7	-0/+8
\| \| \| \| \|
\| \| * \| \|	Remove d3 except for on pages where it's necessary.	Connor Shea	2016-06-01	6	-5/+14
\| \| \| \| \|
\| \| * \| \|	Merge branch '17187-hover-row' into 'master'	Jacob Schatz	2016-06-01	2	-4/+12
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement new row hover style ## What does this MR do? Implement new row hover style ## What are the relevant issue numbers? Closes #17187 ## Screenshots (if relevant) ![Screen_Shot_2016-06-01_at_1.40.04_PM](/uploads/62db01f405db50531fb648e46dc9598a/Screen_Shot_2016-06-01_at_1.40.04_PM.png) cc @dzaporozhets See merge request !4422
\| \| \| * \| \|	Implement new row hover style	Annabel Dunstone	2016-06-01	2	-4/+12
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch '17676-merge-request-widget-alignment' into 'master'	Jacob Schatz	2016-06-01	1	-1/+24
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR widget mobile styling ## What does this MR do? Corrects MR widget styling for mobile viewing. ## Are there points in the code the reviewer needs to double check? I have tested all MR states. ## Why was this MR needed? UX. ## What are the relevant issue numbers? Closes #17676. ## Screenshots (if relevant) ![Screen_Shot_2016-05-31_at_20.04.02](/uploads/b1bc67b1015b2e771ae1b1364b225618/Screen_Shot_2016-05-31_at_20.04.02.png)![Screen_Shot_2016-05-31_at_20.03.50](/uploads/86a552c0d27d6f53cdf1b94631b26449/Screen_Shot_2016-05-31_at_20.03.50.png)![Screen_Shot_2016-05-31_at_20.03.34](/uploads/a5b9e7b634e974095922df9194d493b5/Screen_Shot_2016-05-31_at_20.03.34.png)![Screen_Shot_2016-05-31_at_20.01.35](/uploads/2fc5d49e3c1f2ff2cb324e9527179066/Screen_Shot_2016-05-31_at_20.01.35.png)![Screen_Shot_2016-05-31_at_20.00.25](/uploads/23af913891ff941dc5231872b3c6f177/Screen_Shot_2016-05-31_at_20.00.25.png)![Screen_Shot_2016-05-31_at_19.59.53](/uploads/8abb72609409ba7ca02ad6b35787c15c/Screen_Shot_2016-05-31_at_19.59.53.png)![Screen_Shot_2016-05-31_at_19.58.31](/uploads/fabf1c6c135f5e736614e568fc4cfb53/Screen_Shot_2016-05-31_at_19.58.31.png)![Screen_Shot_2016-05-31_at_19.58.51](/uploads/967a578a34cb3a9dd3723c2f22ce89c4/Screen_Shot_2016-05-31_at_19.58.51.png)![Screen_Shot_2016-05-31_at_23.33.19](/uploads/841af7a90bb3fc3c74a2e51b64fc444f/Screen_Shot_2016-05-31_at_23.33.19.png)![Screen_Shot_2016-05-31_at_23.33.23](/uploads/183fb8407c271d9aa3fefea5d8201238/Screen_Shot_2016-05-31_at_23.33.23.png) See merge request !4386
\| \| \| * \| \|	Fix MR widget mobile styling	Luke "Jared" Bennett	2016-05-31	1	-1/+24
\| \| \| \| \|/ \| \| \| \|/\|
\| * \| \| \|	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-30	26	-228/+644
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Remove accidentally duplicated line.	Fatih Acet	2016-05-25	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	:facepalm:
\| * \| \| \|	Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables	Fatih Acet	2016-05-25	33	-145/+590
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'master' into awardables	ZJ van de Weg	2016-05-25	33	-145/+590
\| \| \|\ \ \ \
\| * \| \| \| \| \|	" :arrow_right: '.	Fatih Acet	2016-05-25	1	-41/+44
\| \|/ / / / /
\| * \| \| \| \|	Handle posting emoji only vote +1 and -1 comments.	Fatih Acet	2016-05-24	1	-24/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And remove mutual votes.
\| * \| \| \| \|	Get award menu url from gl object.	Fatih Acet	2016-05-24	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix award tooltip after voting.awardables-merge	Fatih Acet	2016-05-24	1	-16/+36
\| \| \| \| \| \|
\| * \| \| \| \|	Handle thumbsup and thumbsdown mutuality.	Fatih Acet	2016-05-24	1	-0/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Fix variable name because of a wrong resolved merge conflict.	Fatih Acet	2016-05-23	1	-2/+2
\| \| \| \| \| \|