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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Simplify patch version updates (less steps)	Benny Schimmer	2015-10-20	1	-3/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9732 from MauriceMohlek/patch-1	Stan Hu	2015-10-20	1	-0/+4
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Update CHANGELOG
\| * \| \| \| \| \|	Fix order	Maurice Mohlek	2015-10-20	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update CHANGELOG	Maurice Mohlek	2015-10-20	1	-0/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'remove-duplicate-repos-in-github-import' into 'master'	Douwe Maan	2015-10-20	3	-5/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix duplicate repositories in GitHub import page By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523 See merge request !1644
\| * \| \| \| \|	Fix duplicate repositories in GitHub import page	Stan Hu	2015-10-19	3	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523
* \| \| \| \| \|	Merge pull request #9749 from Bufallo/fix-redis-checkreproduce-500-for-3092	Stan Hu	2015-10-19	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Fix regex in redis version check
\| * \| \| \| \|	Fix regex in redis version check	Benny Schimmer	2015-10-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'	Robert Speicher	2015-10-19	4	-16/+23
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button	Douwe Maan	2015-10-19	60	-180/+577
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Add changelog itemgrzesiek/gitlab-ce-fix/non-member-notification-button	Douwe Maan	2015-10-18	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Sentences end in periods.	Douwe Maan	2015-10-18	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add tooltip.	Douwe Maan	2015-10-18	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Find correct group membership.	Douwe Maan	2015-10-18	2	-8/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button	Douwe Maan	2015-10-18	333	-2233/+4832
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Show notifications button even if user is not member of a project	Grzegorz Bizon	2015-10-12	2	-13/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notifications button was unavailable if user wasn't member of the project, even if protected project is available via group privileges. Showing disabled button with explanation tool-tip is less confusing. This closes #2846.
* \| \| \| \| \| \|	Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into ↵	Robert Speicher	2015-10-19	11	-0/+122
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Send an email to admin email when a user is reported for spam Replaces !1547. Fixes #2839. See merge request !1634
\| * \ \ \ \ \ \	Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify	Douwe Maan	2015-10-19	60	-180/+577
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Satisfy Rubocopjrochkind/gitlab-ce-fix_2839_send_abuse_report_notify	Douwe Maan	2015-10-18	1	-7/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add changelog item	Douwe Maan	2015-10-18	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add help text to admin settings notification email.	Douwe Maan	2015-10-18	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Validate admin notification email.	Douwe Maan	2015-10-18	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix spec.	Douwe Maan	2015-10-18	1	-33/+53
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Only pass abuse report ID to AbuseReportMailer.	Douwe Maan	2015-10-18	2	-6/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add HTML abuse report notification email.	Douwe Maan	2015-10-18	1	-0/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Tweak email body.	Douwe Maan	2015-10-18	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify	Douwe Maan	2015-10-18	492	-4234/+7771
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Send an email (to support) when a user is reported for spam	Jonathan Rochkind	2015-10-08	8	-1/+81
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'merge-request-widget' into 'master'	Dmitriy Zaporozhets	2015-10-19	1	-37/+36
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing commit status for widget when no CI service is enabled Fix for #3082 /cc @dzaporozhets See merge request !1621
\| * \| \| \| \| \| \| \|	Fix missing commit status for widget when no CI service is enabledmerge-request-widget	Kamil Trzcinski	2015-10-16	1	-37/+36
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'index-milestone-title-label' into 'master'	Robert Speicher	2015-10-19	6	-48/+77
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance when filtering on milestone on labels Also some minor refactoring in the seeding. See merge request !1587
\| * \| \| \| \| \| \| \|	Rename confusing methods	Douwe Maan	2015-10-19	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix schemazj/gitlab-ce-index-milestone-title-label	Douwe Maan	2015-10-18	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Merge branch 'master' into zj/gitlab-ce-index-milestone-title-label	Douwe Maan	2015-10-18	74	-559/+1058
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve performance of filtering issues by milestone	Douwe Maan	2015-10-16	1	-30/+33
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve performance of queries	Zeger-Jan van de Weg	2015-10-16	3	-34/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Credits to Douwe Maan
\| * \| \| \| \| \| \| \|	Add project scope to milestone search	Zeger-Jan van de Weg	2015-10-16	1	-1/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Minor refactoring in seeding	Zeger-Jan van de Weg	2015-10-16	4	-5/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add an index to milestones title and label title	Zeger-Jan van de Weg	2015-10-16	2	-0/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'notify-footer' into 'master'	Robert Speicher	2015-10-19	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restore notification footer text See merge request !1640
\| * \| \| \| \| \| \| \| \|	Restore notification footer text.notify-footer	Douwe Maan	2015-10-18	1	-0/+4
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-10-19	1	-1/+0
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'fix-code-leading-indent' into 'master'	Dmitriy Zaporozhets	2015-10-19	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove some padding from code blocks This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else. ![Screen_Shot_2015-10-14_at_2.40.38_PM](https://gitlab.com/pioto/gitlab-ce/uploads/5434eb077c17e56528a94079afe3c732/Screen_Shot_2015-10-14_at_2.40.38_PM.png) See merge request !1596
\| \| * \| \| \| \| \| \| \| \|	Remove some padding from code blocks	Mike Kelly	2015-10-14	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This creates a weird "leading indent" on the first line of code blocks, at least in Chrome 46, and ends up making the first row not line up nicely with everything else.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-files-optionto-changelog'	Dmitriy Zaporozhets	2015-10-19	2	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add changelog itemadd-files-optionto-changelog	Douwe Maan	2015-10-19	2	-0/+3
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'user-page-new-ui' into 'master'	Dmitriy Zaporozhets	2015-10-19	7	-39/+112
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement new UI for user page. Part 1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1615
\| * \| \| \| \| \| \| \| \| \|	Partly implement new UI for user pageuser-page-new-ui	Dmitriy Zaporozhets	2015-10-16	7	-39/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'milestone-issue-sorting-performance' into 'master'	Yorick Peterse	2015-10-19	5	-5/+79
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of sorting milestone issues This will fix the problem described in #3066. See merge request !1609
\| * \| \| \| \| \| \| \| \| \|	Improve performance of sorting milestone issues	Yorick Peterse	2015-10-19	5	-5/+79
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This cuts down the time it takes to sort issues of a milestone by about 10x. In the previous setup the code would run a SQL query for every issue that had to be sorted. The new setup instead runs a single SQL query to update all the given issues at once. The attached benchmark used to run at around 60 iterations per second, using the new setup this hovers around 600 iterations per second. Timing wise a request to update a milestone with 40-something issues would take about 760 ms, in the new setup this only takes about 130 ms. Fixes #3066