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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-typo' into 'master'	Robert Speicher	2015-12-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo [ci skip] See merge request !2035
\| *	Fix typo	Zeger-Jan van de Weg	2015-12-10	1	-1/+1
\| \|
* \|	Update CHANGELOG	Robert Speicher	2015-12-11	1	-0/+1
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'mr-statuses' into 'master'	Robert Speicher	2015-12-11	6	-1/+59
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display referenced merge request statuses in the issue description See gitlab-org/gitlab-ce#3180 for original issue. Previously discussed in !1941 and in !1771 before that. * [x] Show a "Related Merge Requests" list on the issue page under the Description as given by the UI mockup * [x] Display `all_references.merge_requests` and `note.all_references.merge_requests` * [x] Consider displaying the merge request status in addition to the CI status to enable complete merge request status understanding. See merge request !1991
\| * \|	display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statuses	Greg Smethells	2015-12-11	6	-1/+59
\| \| \|
* \| \|	Merge branch 'revert-2037' into 'master'	Dmitriy Zaporozhets	2015-12-11	4	-2/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert removal of RedCloth Revert !2037. See merge request !2071
\| * \| \|	Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037	Douwe Maan	2015-12-11	4	-2/+6
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3.
* \| \|	Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'	Robert Speicher	2015-12-11	4	-8/+46
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix delete notes on merge request diff Fixes #3971 See merge request !2061
\| * \|	[ci skip] Update CHANGELOGfix-delete-notes-on-merge-request-diff	Douglas Barbosa Alexandre	2015-12-10	1	-0/+1
\| \| \|
\| * \|	Remove note from MR discussion when deleting it in the changes tab	Douglas Barbosa Alexandre	2015-12-10	3	-8/+45
\| \| \|
* \| \|	Merge branch 'feature/project_js_from_ee' into 'master'	Douwe Maan	2015-12-11	1	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Aling project js with EE The MR ports the changes introduced by gitlab-org/gitlab-ee!70 in `project.js.coffee`. See merge request !2054
\| * \| \|	Aling project js with EE	Borja Aparicio	2015-12-10	1	-2/+5
\| \| \| \|
* \| \| \|	Merge branch 'complexity/rubocop-metrics' into 'master'	Douwe Maan	2015-12-11	10	-156/+368
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802
\| * \| \| \|	Mix url helpers in into `RepositoryPush`	Grzegorz Bizon	2015-12-11	1	-9/+10
\| \| \| \| \|
\| * \| \| \|	Bump cyclomatic and perceived complexity threshold by one	Grzegorz Bizon	2015-12-08	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Refactor CI YAML processor's validators	Grzegorz Bizon	2015-12-08	2	-29/+43
\| \| \| \| \|
\| * \| \| \|	Check if commits are available in `RepositoryPush`	Grzegorz Bizon	2015-12-08	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Duplicate options in `RepositoryPush`	Grzegorz Bizon	2015-12-08	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Move `common_mentionable_setup` to shared context in specs	Grzegorz Bizon	2015-12-08	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	Add `RepositoryPush` specs	Grzegorz Bizon	2015-12-08	2	-5/+127
\| \| \| \| \|
\| * \| \| \|	Fix specs by adding forgotten instance variable	Grzegorz Bizon	2015-12-08	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Fix url helpers in RepositoryPush	Grzegorz Bizon	2015-12-08	1	-3/+4
\| \| \| \| \|
\| * \| \| \|	Remove obsolete variables in `repository_push_email`	Grzegorz Bizon	2015-12-08	4	-48/+46
\| \| \| \| \|
\| * \| \| \|	Improve Messagee::RepositoryPush	Grzegorz Bizon	2015-12-08	2	-64/+68
\| \| \| \| \|
\| * \| \| \|	Refactor RepositoryPush, move to Message namespace	Grzegorz Bizon	2015-12-08	3	-134/+140
\| \| \| \| \|
\| * \| \| \|	Make `can_send_from_user_email?` public in Notify	Grzegorz Bizon	2015-12-08	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Extract repository_push_email to separate class	Grzegorz Bizon	2015-12-08	2	-77/+135
\| \| \| \| \|
\| * \| \| \|	Enable rubocop metrics	Grzegorz Bizon	2015-12-08	1	-19/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased.
* \| \| \| \|	Merge branch 'fix/award-emoji-alert-width' into 'master'	Grzegorz Bizon	2015-12-11	4	-13/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix award-emojis alert flash message This adds a new feature to `Flash` that allows to pin it after a specified selector. This removes a fixed position from such award-emoji alert, and makes it responsive by design of selector that this alert is pinned to. Closes #3996 \cc @vsizov See merge request !2065
\| * \| \| \| \|	Update changelog	Grzegorz Bizon	2015-12-11	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix award-emojis alert flash message	Grzegorz Bizon	2015-12-11	3	-13/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a new feature to `Flash` that allows to pin it after a specified selector. This removes a fixed position from such award-emoji alert, and makes it responsive by design of selector that this alert is pinned to. Closes #3996
* \| \| \| \|	Merge branch 'emoji_aliases' into 'master'	Valery Sizov	2015-12-11	6	-3/+55
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Emoji aliases problem Fixes #3850 See merge request !2064
\| * \| \| \| \|	emoji aliases problem	Valery Sizov	2015-12-11	6	-3/+55
\|/ / / / /
* \| \| \| \|	Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'	Douwe Maan	2015-12-11	3	-3/+39
\|\ \ \ \ \
\| * \| \| \| \|	Target right release	Zeger-Jan van de Weg	2015-12-10	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into copying-file-seen-as-licence	Zeger-Jan van de Weg	2015-12-10	1055	-9051/+18539
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Licence also accepted as license file	Zeger-Jan van de Weg	2015-12-10	3	-9/+26
\| \| \| \| \| \|
\| * \| \| \| \|	Set changelog item to right release	Zeger-Jan van de Weg	2015-11-11	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into copying-file-seen-as-licence	Zeger-Jan van de Weg	2015-11-11	653	-4489/+10685
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Add specs on #license	Zeger-Jan van de Weg	2015-10-15	3	-2/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add changelog line to right release	Zeger-Jan van de Weg	2015-10-14	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Prefer Licence over Copying	Zeger-Jan van de Weg	2015-10-14	1	-3/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	COPYING is now also accepted as licence file	Zeger-Jan van de Weg	2015-10-14	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2526
* \| \| \| \| \| \|	Merge branch 'rs-update-gitlab_emoji' into 'master'	Valery Sizov	2015-12-11	2	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab_emoji to ~> 0.2.0 A new version of this gem was released October 29th but was never bumped in GitLab. See merge request !1994
\| * \| \| \| \| \| \|	Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emoji	Robert Speicher	2015-12-05	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update CHANGELOG for 7bb8bb85	Stan Hu	2015-12-10	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'auth_hash_fix' into 'master'	Stan Hu	2015-12-11	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand character set of usernames created by Omniauth When a user is created by Omniauth, Gitlab tries to assign the username based on the information provided in the auth hash. If no nickname is present, it uses the part of the email address before the @. This portion of the email address is run through the `parameterize` method, presumably to convert Unicode characters to ASCII. `parameterize` strips out a number of characters that are valid in usernames. For example, `john.doe` is a valid Gitlab username, but parameterize will turn this into `john-doe`. Instead of `parameterize`, this merge request uses `normalize` to convert non-ascii characters. This allows all acceptable characters to be used when creating a username from an email address. See merge request !660
\| * \| \| \| \| \| \| \|	AuthHash should not parameterize email user	Corey Hinshaw	2015-12-10	2	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove_check_icon_from_mr_page' into 'master'	Dmitriy Zaporozhets	2015-12-11	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove check icon from merged MRs Now that GitLab CI exposes the status of each MR in the MR page it seems "redundant" to have an extra icon next to the CI statuses. The "downside" is with people that don't use CI and don't see the statuses, but I don't think that this is that big a change that would miss to anyone. \cc @dzaporozhets @creamzy How it looks now: ![screenshot-gitlab_com_2015-12-10_20-49-53](/uploads/414dcb5131eab2d9518dc77019116c96/screenshot-gitlab_com_2015-12-10_20-49-53.png) See merge request !2059
\| * \| \| \| \| \| \| \| \|	Remove check icon from merged requestsremove_check_icon_from_mr_page	Achilleas Pipinellis	2015-12-10	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now that GitLab CI exposes the status of each MR in the MR page it seems "redundant" to have an extra icon next to the CI statuses.