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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Batch size >1000 does not pay offcomment-batch-size	Jacob Vosmaer	2016-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	We did a small experiment to see how a full scan of the Redis keys on gitlab.com speeds up as we increase the batch size. The values on the right are time in seconds for a full scan (no delete operations). count: 10); 284.500529021 count: 100); 86.21216934 count: 1_000); 60.931676195 count: 10_000); 60.96355610 count: 100_000); 62.378172541 It looks like 1,000 is a good number.
*	Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'	Jacob Schatz	2016-02-24	5	-68/+32
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-0/+2
\| \|
\| *	Fix failing spec	Alfredo Sumaran	2016-02-23	1	-1/+0
\| \|
\| *	Set window_size to 1366*768	Alfredo Sumaran	2016-02-23	2	-2/+2
\| \|
\| *	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
* \|	Merge branch 'bugfix/jschatz/sidebar-issues/minimize-on-diff' into 'master'	Jacob Schatz	2016-02-24	2	-2/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shrink on diff view * Shrinks when navigating to diff view. * Shrinks when refreshing on diff view. * Expandable at anytime. ![diff](/uploads/ec3ff1e7be7571a3af251e9ec9f704c1/diff.gif) See merge request !2735
\| * \|	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	328	-4090/+26555
\| \|\ \
\| * \| \|	Shrink on diff view	Jacob Schatz	2016-02-17	2	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shrinks when navigating to diff view. Shrinks when refreshing on diff view. Expandable at anytime.
* \| \| \|	Merge branch 'fix_git_tag_in_architecture' into 'master'	Achilleas Pipinellis	2016-02-24	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed ~git beeing displayed as link to issues tagged with git in architecture.md The architecture documentation explains `~git` from the picture below which is replaced by a [link to issues tagged with `git`](https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=git). I believe that this was unintended and should be fixed by using backticks. ![Screenshot_from_2016-02-13_21-36-30](/uploads/5ea1a60e8b230952874e58eab0abe1ac/Screenshot_from_2016-02-13_21-36-30.png) See merge request !2814
\| * \| \| \|	Fixed ~git beeing displayed as link to issues tagged with git	Finn Glöe	2016-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'commit-status-permission-update' into 'master'	Achilleas Pipinellis	2016-02-24	1	-0/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update commit status permissions [ci skip] cc @axil See merge request !2942
\| * \| \| \|	Update commit status permissions [ci skip]commit-status-permission-update	Kamil Trzcinski	2016-02-23	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'feature/slack-notifications-on-ci' into 'master'	James Lopez	2016-02-24	2	-0/+54
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update ci configuration to send slack notifications on failure Updates CI config file and adds a task to send notifications when a build fails on master or on any tag. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12805 See merge request !2681
\| * \| \| \| \|	updated gitlab ci based on feedback	James Lopez	2016-02-24	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	fix gitlab-ci.yml	James Lopez	2016-02-22	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-22	227	-3633/+25421
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/slack-notifications-on-ci # Conflicts: # .gitlab-ci.yml
\| * \| \| \| \| \|	resolve merge conflict	James Lopez	2016-02-18	1	-1/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-02-18	365	-2260/+6005
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/slack-notifications-on-ci # Conflicts: # .gitlab-ci.yml
\| * \| \| \| \| \| \|	default slack notification channel	James Lopez	2016-02-08	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update with branch and tags restriction	James Lopez	2016-02-05	2	-7/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	typo to make build fail	James Lopez	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	removed slack task and added bash script instead. Updated gitlab-ci config file	James Lopez	2016-02-05	3	-13/+20
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	uncomment restriction to branches or tags	James Lopez	2016-02-03	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	refactored rake task and make build pass	James Lopez	2016-02-03	3	-6/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	testing build failure	James Lopez	2016-02-03	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update gitlab ci config	James Lopez	2016-02-03	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	make build fail so we can test notifications...	James Lopez	2016-02-03	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update ci configuration to send slack notifications on failure and added ↵	James Lopez	2016-02-03	2	-1/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rake task
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add 8.5.1 in CHANGELOG	Rémy Coutable	2016-02-24	1	-0/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'user-bio-improve' into 'master'	Jacob Schatz	2016-02-24	3	-18/+30
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-18/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	2	-16/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	fixed tests	Phil Hughes	2016-02-24	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Treats activity tabs as single select	Phil Hughes	2016-02-24	1	-13/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #8092
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue_13602' into 'master'	Rémy Coutable	2016-02-24	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix look of tooltip for Revert button. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13602 See merge request !2900