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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove extra spacing from merge request target branch namers-branch-name-space	Robert Speicher	2016-04-15	1	-2/+1
\|
*	Merge branch 'new-mr-improvements' into 'master'	Rémy Coutable	2016-04-15	6	-26/+31
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Updated MR compare Based on in feedback in !3228 See merge request !3704
\| *	Indented code	Phil Hughes	2016-04-15	1	-8/+8
\| \|
\| *	Updated MR comparenew-mr-improvements	Phil Hughes	2016-04-13	6	-26/+31
\| \| \| \| \| \| \| \|	Based on in feedback in !3228
* \|	Add 8.6.6 CHANGELOG entries	Rémy Coutable	2016-04-15	1	-9/+10
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master'	Robert Speicher	2016-04-15	3	-14/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use rugged to change HEAD _Originally opened at !2850 by @pmq20._ Needless to invoke gitlab_shell here, which is slow. See merge request !3705
\| * \|	Remove Gitlab::Shell#update_repository_head since it's not used anymorepmq20/gitlab-ce-psvr/change-head	Rémy Coutable	2016-04-15	1	-13/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \|	Use rugged to change HEAD	P.S.V.R	2016-04-13	2	-1/+4
\| \| \|
* \| \|	Merge branch 'assign-to-issuable-opener' into 'master'	Jacob Schatz	2016-04-15	7	-13/+46
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issuable can be assigned to author Closes #9014 The only difference with #9014 is that I thoughed the author should also be able to assign the issue. If this is unwanted behavior Ill revert it. /cc @DouweM See merge request !2765
\| * \ \	Merge branch 'master' into assign-to-issuable-opener	Zeger-Jan van de Weg	2016-04-15	44	-326/+507
\| \|\ \ \
\| * \| \| \|	Add author id to the right selector	Zeger-Jan van de Weg	2016-04-05	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into assign-to-issuable-opener	Zeger-Jan van de Weg	2016-04-05	241	-1231/+12171
\| \|\ \ \ \
\| * \| \| \| \|	Target right release	Zeger-Jan van de Weg	2016-03-29	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into assign-to-issuable-opener	Zeger-Jan van de Weg	2016-03-29	1078	-10074/+26796
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Revert authors ability to assign anyone	Zeger-Jan van de Weg	2016-02-22	8	-35/+11
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix loading data when no author_id is passed	Zeger-Jan van de Weg	2016-02-22	2	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Issuable can be assigned to author	Zeger-Jan van de Weg	2016-02-22	12	-20/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9014 The only difference with #9014 is that I thoughed the author should also be able to assign the issue. If this is unwanted behavior Ill revert it.
* \| \| \| \| \| \|	Merge branch 'rugged-delete-tag' into 'master'	Rémy Coutable	2016-04-15	5	-28/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete tags via rugged Improve the performance by directly using rugged instead of shelling out to a git operation. See merge request !3748
\| * \| \| \| \| \| \|	Delete tags via rugged	Robert Schilling	2016-04-15	5	-28/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'remove-backend-code' into 'master'	Rémy Coutable	2016-04-15	1	-27/+0
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused backend methods Those backend methods are not used anymore since the functionality of them is replaced with rugged. See merge request !3746
\| * \| \| \| \| \| \|	Remove unused backend methods	Robert Schilling	2016-04-15	1	-27/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of https://github.com/gitlabhq/gitlabhq	Jacob Vosmaer	2016-04-15	1	-1/+1
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Fix required gitlab-shell version.	Rémy Coutable	2016-04-15	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix required gitlab-shell version in the 8.5 to 8.6 update doc.
\| \| * \| \| \| \| \| \|	fix required gitlab-shell version.	lurdan	2016-04-15	1	-1/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Under the procedure, I've warned about gitlab-shell version, which should be 2.6.12 (may be some minor revisions introduces that).
* \| \| \| \| \| \| \|	Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'	Rémy Coutable	2016-04-15	4	-2/+18
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make /profile/keys/new redirects to /profile/keys for back-compat This addresses https://github.com/gitlabhq/gitlabhq/issues/10138. See merge request !3717
\| * \| \| \| \| \| \| \|	Make /profile/keys/new redirects to /profile/keys for back-compat	Rémy Coutable	2016-04-15	4	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch 'i_14431_award_emoji_count_not_in_comment_count' into 'master'	Rémy Coutable	2016-04-15	6	-5/+43
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not include award emojis in issue view comment_count ## What does this MR do? Fixes Issue #14431, changing comment_count on issues index view to not include award emoji comments. While including them is technically correct, it feel nonintuitive in the way comments are presented. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Improves UX of issues view ## What are the relevant issue numbers? #14431 ## Screenshots ### Before - ![Issues before](https://monosnap.com/file/cs7lcEkcChXXvAV22y2gh7gBFWCWjj.png) - ![MR before](https://monosnap.com/file/qzOawShznyXMKK3Z5cij4SKrHO4jNy.png) ### After - ![Issues after](https://monosnap.com/file/IWMedIiGnDnCly7zI5BwNTYQuCS8fH.png) - ![MR after](https://monosnap.com/file/mXJu1C2OVo5DGK0XdD67vPZGNPAw4L.png) See merge request !3610
\| * \| \| \| \| \| \| \| \|	Do not include award emojis in issue view comment_count	theoretick	2016-04-14	6	-5/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Issue #14431
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-trailing-slash-in-search' into 'master'	Douwe Maan	2016-04-15	2	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Escape the query argument provided to `git grep` by `search_files` Closes #14963. See merge request !3633
\| * \| \| \| \| \| \| \| \| \|	Escape the query argument provided to `git grep` by `search_files`rs-trailing-slash-in-search	Robert Speicher	2016-04-09	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14963.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-migrate_new_notification_setting' into 'master'	Robert Speicher	2016-04-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix datetime format when migrating new notification settings on MySQL Closes #15264 See merge request !3733
\| * \| \| \| \| \| \| \| \| \| \|	Fix datetime format when migrating new notification settings on MySQL	Douglas Barbosa Alexandre	2016-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Robert Speicher	2016-04-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change "very demand" to "specific demand" in CI runner docs [ci skip] See merge request !3726
\| * \| \| \| \| \| \| \| \| \| \| \|	change: "very demand" changed to "specific demand"	Jamie Neubert Pedersen	2016-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This must be an error as the sentence doesn't make sense otherwise
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '14176-diff-paste-data' into 'master'	Jacob Schatz	2016-04-14	7	-31/+62
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copying and pasting doesn't grab line numbers or +/- Fixes #14176 See merge request !3687
\| * \| \| \| \| \| \| \| \| \| \| \|	Syntax & style updates14176-diff-paste-data	Annabel Dunstone	2016-04-14	5	-29/+31
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update click_diff_line	Annabel Dunstone	2016-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add line type conditional to diff line helper	Annabel Dunstone	2016-04-14	4	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add content attributes to discussion diffs; change styling of add-note icon ↵	Annabel Dunstone	2016-04-14	4	-22/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to prevent white spaces in paste
\| * \| \| \| \| \| \| \| \| \| \| \|	Copying and pasting doesn't grab line numbers or +/-	Annabel Dunstone	2016-04-14	4	-6/+27
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-sentry-contexts' into 'master'	Stan Hu	2016-04-14	1	-8/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Sentry program context even without a current user See merge request !3729
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add Sentry program context even without a current user	Robert Speicher	2016-04-14	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-ci-nginx-config' into 'master'	Robert Speicher	2016-04-14	1	-29/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated NGINX CI config [ci skip] See merge request !3728
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated NGINX CI config	Achilleas Pipinellis	2016-04-14	1	-29/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'emoji_category_fix' into 'master'	Robert Speicher	2016-04-14	3	-3/+21
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji categories fix Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020 See merge request !3727
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji categories fix	Valery Sizov	2016-04-14	3	-3/+21
\| \| \|_\|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'subscribe-button-fix' into 'master'	Jacob Schatz	2016-04-14	8	-16/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed references to subscribe-button CSS class These were being blocked by adblocks Closes #15043 See merge request !3677
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixed style issuessubscribe-button-fix	Phil Hughes	2016-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixed haml style issues	Phil Hughes	2016-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue with failing tests	Phil Hughes	2016-04-12	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|