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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/master' into remove-wip	Rémy Coutable	2016-03-18	97	-1058/+2686
\|\
\| *	Merge branch 'refactor-ui-lists' into 'master'	Dmitriy Zaporozhets	2016-03-18	7	-44/+26
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor colors and lists * Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3307
\| \| *	Refactor colors and lists	Dmitriy Zaporozhets	2016-03-18	7	-44/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'refactor-variables' into 'master'	Dmitriy Zaporozhets	2016-03-18	4	-33/+64
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor variables Fixes #13803 and other color inconsistency across application cc @jschatz1 @skyruler See merge request !3304
\| \| *	Cleanup somce css colors	Dmitriy Zaporozhets	2016-03-18	4	-20/+25
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| *	Re-group scss variables	Dmitriy Zaporozhets	2016-03-18	1	-21/+47
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Fixes issue with filter label missing on labels & milestones	Phil Hughes	2016-03-18	3	-3/+3
\| \|/
\| *	Fixed issue with labels dropdown getting wrong labels	Phil Hughes	2016-03-18	2	-18/+0
\| \|
\| *	Merge branch 'fix-mr-close-button' into 'master'	Jacob Schatz	2016-03-18	1	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with close button not working on MR Closes #14383 See merge request !3295
\| \| *	Fixes issue with close button not working on MRfix-mr-close-button	Phil Hughes	2016-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #14383
\| * \|	Merge branch 'improved-issue-sidebar' into 'master'	Jacob Schatz	2016-03-18	2	-57/+109
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved issue sidebar Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row. Closes #13353 See merge request !3097
\| \| * \|	Removed global JS varimproved-issue-sidebar	Phil Hughes	2016-03-18	1	-4/+5
\| \| \| \|
\| \| * \|	Reused some variables	Phil Hughes	2016-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set global JS variable to sync view up
\| \| * \|	Links to user on collapsed issue sidebar	Phil Hughes	2016-03-18	1	-0/+4
\| \| \| \|
\| \| * \|	Fixed issue when user doesnt exist	Phil Hughes	2016-03-18	1	-10/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed button hover color
\| \| * \|	Fixed tooltip issue for participants	Phil Hughes	2016-03-18	1	-1/+1
\| \| \| \|
\| \| * \|	Improved issue sidebar	Phil Hughes	2016-03-18	2	-57/+113
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the spacing throughout the sidebar so that it fits better on smaller screens Added more participants button Closes #13353
\| * \|	Another CS style fixissue-fade-load	Phil Hughes	2016-03-18	1	-1/+1
\| \| \|
\| * \|	Fixed some CS styling issues	Phil Hughes	2016-03-18	4	-74/+85
\| \| \| \| \| \| \| \| \| \| \| \|	Fixed bug where wouldn't work on MR index
\| * \|	Fixed issue with dashboard issues not reloading	Phil Hughes	2016-03-18	3	-4/+17
\| \| \|
\| * \|	Changing filter dropdowns shows loading	Phil Hughes	2016-03-18	5	-15/+42
\| \| \| \| \| \| \| \| \| \| \| \|	Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well
\| * \|	Merge branch 'improve-diff-ui' into 'master'	Jacob Schatz	2016-03-18	1	-1/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add space to separate different files in diff I propose to add some visual separation between files in diff. Originally this separation was removed in 8.0 because of different UI layout. Now when we have white layout back I think it will be better to add some space between files. - - - Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3275
\| \| * \|	Add space to separate different files in diffimprove-diff-ui	Dmitriy Zaporozhets	2016-03-17	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'optimistic-todos' into 'master'	Jacob Schatz	2016-03-18	3	-1/+68
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds small AJAX optimistic functionality to todos. Fixes #13656 <br/> A good first step and boring solution. <br/> Will make ajax call to remove each issue. <br/> If issue is last in group of issues will refresh page. <br/> If issues remain in group will remove row with JS. <br/> Adds loading spinner to button and disables. <br/> ![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/> cc @dzaporozhets @JobV @dbalexandre See merge request !2946
\| \| * \| \|	Mark all as done through AJAX	Phil Hughes	2016-03-17	1	-5/+26
\| \| \| \| \|
\| \| * \| \|	Removed the flash success message	Phil Hughes	2016-03-17	3	-38/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes the group if empty
\| \| * \| \|	Remove `Flash` from todos when finished	Jacob Schatz	2016-03-17	1	-1/+0
\| \| \| \| \|
\| \| * \| \|	Adds small AJAX optimistic functionality to todos.	Jacob Schatz	2016-03-17	3	-1/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13656 A good first step and boring solution.
\| * \| \| \|	Changed any variable name to save confusion	Phil Hughes	2016-03-18	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Removed comparing against text	Phil Hughes	2016-03-18	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Fixes issue with any milestone value in dropdown not being selectable	Phil Hughes	2016-03-18	1	-1/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Closes #14293
\| * \| \|	Merge branch 'fix-group-members-ui' into 'master'	Dmitriy Zaporozhets	2016-03-18	1	-0/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add side padding to content-list if inside panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #14367, #14349 See merge request !3273
\| \| * \| \|	Add side padding to content-list if inside panelfix-group-members-ui	Dmitriy Zaporozhets	2016-03-17	1	-0/+4
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master'	Jacob Schatz	2016-03-17	1	-0/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing dropdown to get cut off in project page closes #14336 ### Before ![Screen_Shot_2016-03-16_at_11.30.40_PM](/uploads/9f8dd10f0627cdfbd49d7127b233b105/Screen_Shot_2016-03-16_at_11.30.40_PM.png) ![Screen_Shot_2016-03-16_at_11.30.53_PM](/uploads/6dfe64d68867d158a11be7e74cbd1520/Screen_Shot_2016-03-16_at_11.30.53_PM.png) ### After ![Screen_Shot_2016-03-16_at_11.30.14_PM](/uploads/2b87cc17522e8a425a97a78b36982873/Screen_Shot_2016-03-16_at_11.30.14_PM.png) See merge request !3257
\| \| * \| \|	fix bug causing dropdown to get cut off in project pagefix_dropdown_getting_cut_off_in_page	Arinde Eniola	2016-03-16	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	Merge branch 'download-dropdown-alignment' into 'master'	Jacob Schatz	2016-03-17	1	-0/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment of download dropdown With the new dropdown CSS - some dropdowns might look a bit odd ## Previously ![Screen_Shot_2016-03-16_at_11.46.04](/uploads/c1a8fc95ed4410de35d7bd5caedf28f5/Screen_Shot_2016-03-16_at_11.46.04.png) ## Now ![Screen_Shot_2016-03-16_at_11.45.26](/uploads/998637fe0872b2e826a8c17d183499dc/Screen_Shot_2016-03-16_at_11.45.26.png) See merge request !3245
\| \| * \| \| \|	Fixed alignment of download dropdowndownload-dropdown-alignment	Phil Hughes	2016-03-16	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With the new dropdown CSS - some dropdowns might look a bit odd
\| * \| \| \| \|	Merge branch 'filter-spacing' into 'master'	Jacob Schatz	2016-03-17	1	-14/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed filter spacing Closes #14350 ![Screen_Shot_2016-03-17_at_10.21.33](/uploads/5b8f39134cc90ce1dd6565f665a39838/Screen_Shot_2016-03-17_at_10.21.33.png) See merge request !3267
\| \| * \| \| \| \|	Fixed filter spacingfilter-spacing	Phil Hughes	2016-03-17	1	-14/+3
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14350
\| * \| \| \| \|	Merge branch 'edited-text' into 'master'	Robert Speicher	2016-03-17	2	-0/+9
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited timeago text on comments Unified the 'edited text' to be the same in descriptions and comments Closes #5538 See merge request !3063
\| \| * \| \| \| \|	Edited timeago text on comments	Phil Hughes	2016-03-10	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unified the 'edited text' to be the same in descriptions and comments Closes #5538
\| * \| \| \| \| \|	Merge branch 'blue-links-fix' into 'master'	Jacob Schatz	2016-03-17	1	-4/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert color for links inside gray areas Before ![Screen_Shot_2016-03-17_at_12.23.17_PM](/uploads/55e518721d83c3bfc42edba3e97ec44d/Screen_Shot_2016-03-17_at_12.23.17_PM.png) After ![Screen_Shot_2016-03-17_at_12.23.03_PM](/uploads/08fbf8e9139e4eadf191102cffd29617/Screen_Shot_2016-03-17_at_12.23.03_PM.png) Reverts !3147 See merge request !3276
\| \| * \| \| \| \| \|	Revert link color from blueblue-links-fix	Alfredo Sumaran	2016-03-17	1	-4/+0
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'hide-builds-feature' into 'master'	Robert Speicher	2016-03-17	1	-0/+13
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide builds from Project's settings when the feature is disabled Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944 See merge request !3220
\| \| * \| \| \| \|	Hide builds from Project's settings when the feature is disabledhide-builds-feature	Kamil Trzcinski	2016-03-15	1	-0/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'new-branch-button-issue' into 'master'	Douwe Maan	2016-03-17	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New branch button on issues Creates a button which creates a branch for you, referencing the original issue in the branch name. When creating the MR the text `Closes #iid` is appended to the description field. The button; with styling ![Screenshot_from_2016-02-13_17-28-54](/uploads/9595fbfef88c10a499829beaa3db11c1/Screenshot_from_2016-02-13_17-28-54.png) Links to the related branches on the issue ![Screenshot_from_2016-02-13_17-31-48](/uploads/ee7a78754eb5e2389f8671771bb59af9/Screenshot_from_2016-02-13_17-31-48.png) Styled like the MR links ![Screenshot_from_2016-02-13_17-31-53](/uploads/c60130333a650a16f51b014aeb1458c3/Screenshot_from_2016-02-13_17-31-53.png) Please provide input on the following; the CI repo on the GDK had the following happening with the current way I implemented the matching: ![Screenshot_from_2016-02-14_08-57-19](/uploads/35e7a3687a0fa801aba1ad66305ab2ff/Screenshot_from_2016-02-14_08-57-19.png) Closes #3886 cc @DouweM See merge request !2808
\| \| * \ \ \ \ \	Merge branch 'master' into new-branch-button-issue	Zeger-Jan van de Weg	2016-03-17	53	-384/+381
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Incorporate review	Zeger-Jan van de Weg	2016-03-15	1	-6/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	new-branch-button	Zeger-Jan van de Weg	2016-03-15	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix_horizontal_overflow_in_code_tag' into 'master'	Jacob Schatz	2016-03-17	1	-0/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix horizontal overflow that occurs in the code tag closes #14167 ### Before Fix ![Screen_Shot_2016-03-16_at_9.10.52_PM](/uploads/b4a282ffc33684983d7e2482b8e13a8f/Screen_Shot_2016-03-16_at_9.10.52_PM.png) ### After Fix ![Screen_Shot_2016-03-16_at_9.11.16_PM](/uploads/8acca3b46bfdbd929cc096ad070022e2/Screen_Shot_2016-03-16_at_9.11.16_PM.png) See merge request !3255