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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix syntax error in autosave coffeescript.coffeescript_syntax_error	Marin Jankovski	2016-02-26	1	-3/+3
\|
*	Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'	Jacob Schatz	2016-02-24	3	-66/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidebar overlaps content when screen is below 1200px. When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717 ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif) ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif) Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620
\| *	Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizing	Alfredo Sumaran	2016-02-23	1	-0/+1
\| \|
\| *	Ability to toggle sidebar on smaller screens	Alfredo Sumaran	2016-02-23	3	-20/+12
\| \|
\| *	Fixes padding when right sidebar is not present	Alfredo Sumaran	2016-02-23	1	-0/+11
\| \|
\| *	Update scrollbars after toggle sidebar	Alfredo Sumaran	2016-02-23	1	-0/+6
\| \|
\| *	Sidebar overlaps content when screen is below 1200px.	Jacob Schatz	2016-02-16	3	-67/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717
* \|	Wait until listeners are set before triggering a 'click' eventbugfix/jschatz/sidebar-issues/minimize-on-diff	Alfredo Sumaran	2016-02-24	1	-3/+7
\| \|
* \|	Move script inside of MergeRequestTabs class	Alfredo Sumaran	2016-02-24	2	-12/+10
\| \|
* \|	Merge branch 'master' into minimize-on-diff	Alfredo Sumaran	2016-02-24	36	-1431/+2180
\|\ \
\| * \	Merge branch 'user-bio-improve' into 'master'	Jacob Schatz	2016-02-24	1	-6/+15
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the formatting for the user page bio Resolves #13406. Problems, per the Issue above: - The bio has an extra period appended by the HAML view. - The bio isn't given its own line, not differentiated from username and account creation date. - The bio is allowed to span almost the full width of the container, would probably look better if it were only allowed a max width of something like 750px. This commit: - Separates the User page bio from the username and account creation date. - Separates the pseudo-selector adding a Middle Dot out from the `profile-link-holder` class and into a `middle-dot-divider` class. Before: ![Screen_Shot_2016-02-15_at_3.55.28_PM](/uploads/fbe410c3f436740121c5f4686e0f44d0/Screen_Shot_2016-02-15_at_3.55.28_PM.png) With this Merge Request: ![Screen_Shot_2016-02-15_at_3.55.25_PM](/uploads/b4b16376a395608f57d8f76ab47e241f/Screen_Shot_2016-02-15_at_3.55.25_PM.png) See merge request !2827
\| \| * \|	Improve the formatting for the user page bioconnorshea/gitlab-ce-user-bio-improve	connorshea	2016-02-23	1	-6/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Separates the User page bio from the username and account creation date. - Separates the pseudo-selector adding a Middle Dot out from the `profile-link-holder` class and into a `middle-dot-divider` class. Resolves #13406. See merge request !2827.
\| * \| \|	Merge branch 'highlighted-note' into 'master'	Jacob Schatz	2016-02-24	7	-9/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed padding & background color for highlighted notes Closes #12453 ![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png) See merge request !2937
\| \| * \| \|	changed variable name to -hoverhighlighted-note	Phil Hughes	2016-02-23	7	-8/+8
\| \| \| \| \|
\| \| * \| \|	Changed padding & background color for highlighted notes	Phil Hughes	2016-02-23	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12453
\| * \| \| \|	Merge branch 'gray-content-block-btn-alignment' into 'master'	Jacob Schatz	2016-02-24	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly aligned buttons vertical in gray-content-block Closes #12790 ![Screen_Shot_2016-02-23_at_15.09.19](/uploads/e5c6d97d8c1712273c87a0d592430390/Screen_Shot_2016-02-23_at_15.09.19.png) See merge request !2941
\| \| * \| \| \|	Correctly aligned buttons vertical in gray-content-blockgray-content-block-btn-alignment	Phil Hughes	2016-02-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12790
\| * \| \| \| \|	Merge branch 'activity-tabs-single-select' into 'master'	Jacob Schatz	2016-02-24	1	-13/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Treats activity tabs as single select Fixes #8092 ![activity-tabs](/uploads/1fb4d9233492252cfd93c74579e97514/activity-tabs.gif) See merge request !2940
\| \| * \| \| \| \|	changed bind to on for activity link click eventactivity-tabs-single-select	Phil Hughes	2016-02-24	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Treats activity tabs as single select	Phil Hughes	2016-02-24	1	-13/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #8092
\| * \| \| \| \| \|	Merge branch 'bugfix/jschatz1/missing-project-button' into 'master'	Rémy Coutable	2016-02-24	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix group projects styles Makes new project button visible when no projects are available. Fixes #13193 # BEFORE ![Screen_Shot_2016-02-04_at_1.08.27_PM](/uploads/36be9d5892506e7d1abcf4eb2a622e12/Screen_Shot_2016-02-04_at_1.08.27_PM.png) # AFTER (w/projects) ![Screen_Shot_2016-02-04_at_1.07.48_PM](/uploads/fa257a1965017ff1274572dc66fccf90/Screen_Shot_2016-02-04_at_1.07.48_PM.png) # AFTER (no projects) ![Screen_Shot_2016-02-04_at_1.07.28_PM](/uploads/326f6fdac24b56e8408efd0d11dc2805/Screen_Shot_2016-02-04_at_1.07.28_PM.png) cc @creamzy @skyruler See merge request !2714
\| \| * \| \| \| \|	Initialize navigation shortcuts on project's files pagebugfix/jschatz1/missing-project-button	Alfredo Sumaran	2016-02-23	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Re-use existing top area elements	Alfredo Sumaran	2016-02-23	1	-16/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix group projects styles	Jacob Schatz	2016-02-23	1	-0/+16
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Makes new project button visible when no projects are available. Fixes #13193
\| * \| \| \| \|	Merge branch 'issue_13301_emoji-menu' into 'master'	Robert Speicher	2016-02-24	1	-3/+13
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load award emoji picker with ajax request Fixes #13301. See merge request !2888
\| \| * \| \| \|	Create EmojisController	Annabel Dunstone	2016-02-22	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Add timeout for ajax call in award emoji steps; update focus in award picker	Annabel Dunstone	2016-02-19	1	-1/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Load award emoji picker with ajax request	Annabel Dunstone	2016-02-18	1	-2/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Add "e" shortcut to edit issuableissue_13510	Alfredo Sumaran	2016-02-23	1	-0/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'dz-small-ui-fixes' into 'master'	Jacob Schatz	2016-02-23	3	-8/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
\| \| * \| \| \| \|	Set of small improvements to wiki frontend	Dmitriy Zaporozhets	2016-02-07	3	-8/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch 'files-view-row-click' into 'master'	Jacob Schatz	2016-02-23	1	-0/+2
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with file view rows not clickable on project main view Fixed an issue where it would only load the first 25 commit data on project main view. Stopped the file view sending 1 too many requests. Fixes #3916 See merge request !2933
\| \| * \| \| \| \|	Correctly checks if tree view is on screen	Phil Hughes	2016-02-23	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fixes issue with file view rows not clickable on project main viewfiles-view-row-click	Phil Hughes	2016-02-23	1	-0/+2
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed an issue where it would only load the first 25 commit data on project main view Stopped the file view sending 1 too many requests Fixes #3916
\| * \| \| \| \|	Merge branch 'milestone-drag-empty-list' into 'master'	Jacob Schatz	2016-02-23	1	-9/+21
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues can be dragged & dropped into empty milestone lists This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668 ![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif) See merge request !2935
\| \| * \| \| \| \|	Issues can be dragged & dropped into empty milestone lists	Phil Hughes	2016-02-23	1	-9/+21
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is also possible with MRs. Also fixed an issue where MRs weren't sortable Fixes #13668
\| * \| \| \| \|	Merge branch 'dashboard-misaligned-buttons' into 'master'	Jacob Schatz	2016-02-23	1	-0/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed mis-aligned buttons on dashboard/issues Before: ![](/uploads/35e413f2a5273bcdb1cc9ab20fa8d923/Screen_Shot_2016-02-22_at_10.15.39_PM.png) After: ![Screen_Shot_2016-02-23_at_08.45.12](/uploads/4fbba0650ea6005b1cd600b5038f91d1/Screen_Shot_2016-02-23_at_08.45.12.png) See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2921#note_3868715 See merge request !2932
\| \| * \| \| \| \|	Fixed mis-aligned buttons on dashboard/issuesdashboard-misaligned-buttons	Phil Hughes	2016-02-23	1	-0/+1
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'issue_11874' into 'master'	Jacob Schatz	2016-02-23	6	-56/+127
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes dropdown appearance and makes it look accordingly to current design Fixes #11874 See merge request !2920
\| \| * \| \| \|	Do not use calc and fix background spinner for high density displaysissue_11874	Alfredo Sumaran	2016-02-22	1	-3/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Use or create variables	Alfredo Sumaran	2016-02-22	3	-8/+9
\| \| \| \| \| \|
\| \| * \| \| \|	Simpler way to place arrow	Alfredo Sumaran	2016-02-22	1	-3/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Delete unused CSS rule	Alfredo Sumaran	2016-02-22	1	-7/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Update dropdown menu style	Alfredo Sumaran	2016-02-22	5	-37/+85
\| \| \| \| \| \|
\| \| * \| \| \|	Make select2 design consistent	Alfredo Sumaran	2016-02-21	5	-29/+57
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'blame-line-link' into 'master'	Jacob Schatz	2016-02-22	2	-2/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added line links to blame table Closes #4119 See merge request !2915
\| \| * \| \| \| \|	Added line links to blame tableblame-line-link	Phil Hughes	2016-02-22	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4119
\| * \| \| \| \| \|	Merge branch 'status-indicator-size' into 'master'	Jacob Schatz	2016-02-22	1	-6/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed the size of status indicators ![Screen_Shot_2016-02-22_at_12.53.25](/uploads/229593bf76a78a2ce658c565d805716a/Screen_Shot_2016-02-22_at_12.53.25.png) ![Screen_Shot_2016-02-22_at_12.53.36](/uploads/d328809a3288943a47bed2cf13611a03/Screen_Shot_2016-02-22_at_12.53.36.png) Closes #12763 See merge request !2913
\| \| * \| \| \| \| \|	Changed the size of status indicatorsstatus-indicator-size	Phil Hughes	2016-02-22	1	-6/+3
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12763
\| * \| \| \| \| \|	Merge branch 'header-overflow-small-devices' into 'master'	Jacob Schatz	2016-02-22	2	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with header overflow Fixes #13492 Before: ![Screen_Shot_2016-02-22_at_15.32.42](/uploads/aefec4e67368d0387f22448be8eea65c/Screen_Shot_2016-02-22_at_15.32.42.png) After: ![Screen_Shot_2016-02-22_at_15.32.09](/uploads/76b0d96cd5d9a4076c9d0883aaaba003/Screen_Shot_2016-02-22_at_15.32.09.png) See merge request !2921