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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs	Jacob Vosmaer	2016-03-01	23	-147/+297
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'master' into issue_13212issue_13212	Alfredo Sumaran	2016-02-29	7	-17/+113
\| \|\ \
\| \| * \	Merge branch 'issue_13648' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-8/+6
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve implementation to check read access to forks and add pagination. Fixes #13648 The following optimizations where made: - Pagination was added. - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project. See merge request !2991
\| \| \| * \|	Improve implementation to check read access to forks and add pagination.	Rubén Dávila	2016-02-26	1	-8/+6
\| \| \| \| \|
\| \| * \| \|	Merge branch 'too-many-changes-btns' into 'master'	Jacob Schatz	2016-02-29	1	-6/+5
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed too many changes buttons to white Closes #13751 ![Screen_Shot_2016-02-29_at_09.18.41](/uploads/30f5d11d1a4e1785561597feeeb40f09/Screen_Shot_2016-02-29_at_09.18.41.png) See merge request !3002
\| \| \| * \| \|	Changed too many changes buttons to whitetoo-many-changes-btns	Phil Hughes	2016-02-29	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13751
\| \| * \| \| \|	Merge branch 'improve-todos-css' into 'master'	Dmitriy Zaporozhets	2016-02-29	1	-3/+3
\| \| \|\ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Small css cleanup for todos feature Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Cleanup for !2817 Fixes #13816 cc @jschatz1 @skyruler @dbalexandre See merge request !2996
\| \| \| * \| \|	Small css cleanup for todos featureimprove-todos-css	Dmitriy Zaporozhets	2016-02-27	1	-3/+3
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Merge branch '11489-branded-appearance-to-ce' into 'master'	Douwe Maan	2016-02-29	4	-0/+99
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Branded appearance to CE Closes #11489 The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too. TODO: - [x] Copy docs - [x] Make new screenshots - [ ] Remove Custom Welcome message feature? @rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink: /cc @DouweM See merge request !2927
\| \| \| * \|	Branded login page also in CE11489-branded-appearance-to-ce	Zeger-Jan van de Weg	2016-02-26	4	-0/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
\| * \| \| \|	Wrap icon with edited time	Alfredo Sumaran	2016-02-29	1	-1/+1
\| \|/ / /
\| * \| \|	Merge branch 'avatar-cropping' into 'master'	Jacob Schatz	2016-02-26	1	-0/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+3
\| \| \|\ \ \ \| \| \| \|/ /
\| \| * \| \|	Merge branch 'rs-crowd-form-view-spec' into avatar-cropping	Alfredo Sumaran	2016-02-24	3	-8/+8
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-24	5	-30/+32
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'master' into avatar-cropping	Alfredo Sumaran	2016-02-23	59	-231/+464
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Improve avatar cropping internals, based on suggestions made by @rspeicher ↵	Johann Pardanaud	2016-02-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on !2773
\| \| * \| \| \| \| \|	Merge branch 'master' into avatar-cropping	Johann Pardanaud	2016-02-16	31	-105/+128
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/models/user.rb
\| \| * \| \| \| \| \| \|	Fix #7959: Fix avatar stretching by providing a cropping feature	Johann Pardanaud	2016-02-09	1	-1/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'sidebar-hide-class' into 'master'	Rémy Coutable	2016-02-26	2	-18/+18
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-18/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #13764
\| * \| \| \| \| \| \| \|	Improve help UI page	Dmitriy Zaporozhets	2016-02-26	1	-104/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Fix description margin for groups list	Dmitriy Zaporozhets	2016-02-26	3	-4/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Refactor styles for merge requests list	Dmitriy Zaporozhets	2016-02-26	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Refactor styles for issues list	Dmitriy Zaporozhets	2016-02-26	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Cleanup css for projects list	Dmitriy Zaporozhets	2016-02-26	2	-3/+3
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Merge branch 'rs-crowd-form-view-spec' into 'master'	Rémy Coutable	2016-02-26	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+2
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	No need for compare_failed	Jacob Vosmaer	2016-02-26	1	-17/+12
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Return an Enumerator from Diff::Parser	Jacob Vosmaer	2016-02-26	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Make more use of DiffHelper	Jacob Vosmaer	2016-02-26	5	-6/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use less to_a	Jacob Vosmaer	2016-02-25	3	-7/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Too painful to read	Jacob Vosmaer	2016-02-25	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffs	Jacob Vosmaer	2016-02-25	114	-589/+896
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	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	1	-12/+14
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-12/+14
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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 'bugfix/jschatz1/missing-project-button' into 'master'	Rémy Coutable	2016-02-24	2	-9/+9
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \|	Fix group projects styles	Jacob Schatz	2016-02-23	2	-9/+9
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-9/+9
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load award emoji picker with ajax request Fixes #13301. See merge request !2888
\| \| * \| \| \|	Create EmojisController	Annabel Dunstone	2016-02-22	1	-0/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Load award emoji picker with ajax request	Annabel Dunstone	2016-02-18	2	-9/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'issue_13510' into 'master'	Jacob Schatz	2016-02-23	1	-0/+8
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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