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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spaces	evuez	2016-02-26	1	-0/+3
\|
*	Merge branch 'avatar-cropping' into 'master'	Jacob Schatz	2016-02-26	9	-5/+129
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix avatar stretching by providing a cropping feature Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773 Fixes #7959 See merge request !2951
\| *	Merge branch 'master' into avatar-croppingavatar-cropping	Alfredo Sumaran	2016-02-26	8	-73/+50
\| \|\
\| * \	Merge branch 'rs-crowd-form-view-spec' into avatar-cropping	Alfredo Sumaran	2016-02-24	4	-8/+12
\| \|\ \
\| * \| \|	Add `:with_avatar` trait to User factory	Robert Speicher	2016-02-24	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-24	18	-62/+82
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-23	153	-1811/+3800
\| \|\ \ \ \
\| * \| \| \| \|	Minor changes on avatar cropping internals	Johann Pardanaud	2016-02-18	2	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Avoid multiple calls to `validates` for the avatar attributes. - In a cropping process, don't check if the model inherits `User`, check if it responds to `:avatar_crop_size`.
\| * \| \| \| \|	Improve avatar cropping internals, based on suggestions made by @rspeicher ↵	Johann Pardanaud	2016-02-17	4	-15/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on !2773
\| * \| \| \| \|	Merge branch 'master' into avatar-cropping	Johann Pardanaud	2016-02-16	87	-469/+576
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/models/user.rb
\| * \| \| \| \| \|	Improve user experience for avatar cropping	Johann Pardanaud	2016-02-16	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Avoid incomprehensible errors on non-integer cropping values - Set the default cropping area to 80%
\| * \| \| \| \| \|	Fix failing tests introduced in commit 6d58088	Johann Pardanaud	2016-02-10	1	-2/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix #7959: Fix avatar stretching by providing a cropping feature	Johann Pardanaud	2016-02-09	9	-8/+133
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sidebar-hide-class' into 'master'	Rémy Coutable	2016-02-26	3	-26/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created helper class to hide content in issue sidebar when collapsed ![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png) Closes #13764 See merge request !2968
\| * \| \| \| \| \| \|	Created helper class to hide content in issue sidebar when collapsedsidebar-hide-class	Phil Hughes	2016-02-25	3	-26/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13764
* \| \| \| \| \| \| \|	Merge branch 'refactor-lists' into 'master'	Dmitriy Zaporozhets	2016-02-26	17	-171/+171
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor html/css for lists and improve help UI page * dry lists html/css removing a lot of style duplicates * fix snippets list to match common style * fix extra bottom margin for groups list * improve help page ui so it looks clean Fixes #11873 See merge request !2977
\| * \| \| \| \| \| \|	Improve help UI page	Dmitriy Zaporozhets	2016-02-26	2	-104/+127
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix description margin for groups list	Dmitriy Zaporozhets	2016-02-26	5	-11/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Refactor styles for merge requests list	Dmitriy Zaporozhets	2016-02-26	3	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Refactor styles for issues list	Dmitriy Zaporozhets	2016-02-26	4	-16/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Refactor css for groups list	Dmitriy Zaporozhets	2016-02-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Refactor css for snippets list	Dmitriy Zaporozhets	2016-02-26	3	-28/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Cleanup css for projects list	Dmitriy Zaporozhets	2016-02-26	5	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	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