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

	Commit message (Collapse)	Author	Age	Files	Lines
*	test	James Lopez	2016-02-24	1	-5/+1
\|
*	make build fail	James Lopez	2016-02-24	1	-1/+1
\|
*	testing script	James Lopez	2016-02-24	1	-285/+6
\|
*	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
\| * \| \| \| \| \| \| \| \|	Fix look of tooltip for Revert button.issue_13602	Rubén Dávila	2016-02-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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 'bring-back-newrelic-gem' into 'master'	Rémy Coutable	2016-02-24	3	-0/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943
\| * \| \| \| \| \| \| \| \|	Revert "Remove newrelic gem. Closes #12860"	Stan Hu	2016-02-23	3	-0/+20
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock
* \| \| \| \| \| \| \| \|	Merge branch 'issue_13301_emoji-menu' into 'master'	Robert Speicher	2016-02-24	6	-13/+32
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load award emoji picker with ajax request Fixes #13301. See merge request !2888
\| * \| \| \| \| \| \| \|	Update award_emoji test	Annabel Dunstone	2016-02-23	2	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Create EmojisController	Annabel Dunstone	2016-02-22	5	-6/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add timeout for ajax call in award emoji steps; update focus in award picker	Annabel Dunstone	2016-02-19	2	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Load award emoji picker with ajax request	Annabel Dunstone	2016-02-18	5	-11/+25
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-update-raven' into 'master'	Robert Speicher	2016-02-23	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sentry-raven to 0.15.6 Fixes a few bugs, most notably (for our purposes): https://github.com/getsentry/raven-ruby/pull/450 See merge request !2947
\| * \| \| \| \| \| \| \| \|	Update sentry-raven to 0.15.6	Robert Speicher	2016-02-23	2	-3/+3
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue_13510' into 'master'	Jacob Schatz	2016-02-23	3	-0/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds "e" shortcut to issuable pages which redirects to the Edit page Closes #13510 See merge request !2945
\| * \| \| \| \| \| \| \| \|	Update shortcuts image	Alfredo Sumaran	2016-02-23	1	-0/+0
\| \| \| \| \| \| \| \| \| \|