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 'rs-crowd-form-view-spec' into 'master'	Rémy Coutable	2016-02-26	2	-2/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move "I should see Crowd login form" feature to a view spec We were doing all kinds of code gymnastics to "enable" Crowd in the feature spec and this would sometimes cause a transient failure. Really what it's testing is if the Crowd login form shows when Crowd's enabled, so this is much better suited to a view spec. See merge request !2963
\| *	Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-spec	Robert Speicher	2016-02-24	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were doing all kinds of code gymnastics to "enable" Crowd in the feature spec and this would sometimes cause a transient failure. Really what it's testing is if the Crowd login form shows when Crowd's enabled, so this is much better suited to a view spec.
* \|	Merge branch 'fix-todos' into 'master'	Robert Speicher	2016-02-25	2	-3/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Does not create a Todo when commenting on commit or project snippet Closes #13733 See merge request !2964
\| * \|	Does not create a todo when commenting on commit or project snippet	Douglas Barbosa Alexandre	2016-02-24	2	-3/+2
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage'	Dmitriy Zaporozhets	2016-02-25	1	-1/+3
\|\ \ \
\| * \| \|	Show test coverage on project builds page	Steffen Köhler	2016-02-22	1	-1/+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
\| \| \| \| \|
* \| \| \| \|	Remove unused methods	Alfredo Sumaran	2016-02-24	1	-16/+0
\| \| \| \| \|
* \| \| \| \|	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	163	-1870/+3812
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'andywgrant/gitlab-ce-master' into 'master'	Dmitriy Zaporozhets	2016-02-24	2	-6/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "issue" to Close/Reopen buttons for clarity _Originally opened by @andywgrant at !2884_ --- Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13549 See merge request !2929
\| \| * \| \| \|	Add "issue" to Close/Reopen buttons for clarityandywgrant/gitlab-ce-master	Andy Grant	2016-02-22	2	-6/+6
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'user-bio-improve' into 'master'	Jacob Schatz	2016-02-24	2	-18/+29
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-18/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	3	-9/+10
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-9/+25
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-12/+28
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load award emoji picker with ajax request Fixes #13301. See merge request !2888
\| \| * \| \| \| \| \|	Update award_emoji test	Annabel Dunstone	2016-02-23	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Create EmojisController	Annabel Dunstone	2016-02-22	4	-5/+6
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	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	4	-11/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'issue_13510' into 'master'	Jacob Schatz	2016-02-23	2	-0/+16
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds "e" shortcut to issuable pages which redirects to the Edit page Closes #13510 See merge request !2945
\| \| * \| \| \| \| \| \|	Add "e" shortcut to help modal	Alfredo Sumaran	2016-02-23	1	-0/+8
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add "e" shortcut to edit issuableissue_13510	Alfredo Sumaran	2016-02-23	1	-0/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master'	Robert Speicher	2016-02-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show Crowd login even when sign-in is disabled Fixes #13176. See merge request !2749
\| \| * \| \| \| \| \| \| \|	Show Crowd login even when sign-in is disabled	Peter Hudec	2016-02-23	1	-1/+1
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'fix-todos' into 'master'	Robert Speicher	2016-02-23	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Does not raise an error when Todo is already marked as done Closes #13681 See merge request !2926
\| \| * \| \| \| \| \|	Does not raise an error when Todo is already marked as done	Douglas Barbosa Alexandre	2016-02-23	2	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'dz-small-ui-fixes' into 'master'	Jacob Schatz	2016-02-23	19	-88/+90
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set of UI fixes * Improve wiki pages * Improve profile pages cc @skyruler See merge request !2758
\| \| * \| \| \| \| \| \|	Update tests to match new wiki header	Dmitriy Zaporozhets	2016-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Set of small improvements to wiki frontend	Dmitriy Zaporozhets	2016-02-07	10	-54/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \| \|	Set of small UI fixes to project and profile pages	Dmitriy Zaporozhets	2016-02-07	9	-34/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'files-view-row-click' into 'master'	Jacob Schatz	2016-02-23	3	-8/+7
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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