Grzegorz BizonandRobert Speicher 23975e093b Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' ...

Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936

2015-12-07 14:33:36 -05:00

..

ci

Merge branch 'fix-application-settings-not-expiring' into 'master'

2015-12-04 14:36:30 -05:00

concerns

Merge branch 'fix-award-emoji-api' into 'master'

2015-11-21 22:46:18 -05:00

hooks

Annotate models

2015-11-13 19:22:46 +01:00

members

Re-annotate models

2015-05-03 13:38:27 -07:00

network

Merge pull request #7999 from cirosantilli/append-inplace

2015-01-21 23:07:15 -08:00

project_services

Merge branch 'ci-fix-500' into 'master'

2015-11-23 16:53:19 -05:00

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' into 'master'

2015-11-19 12:22:45 -05:00

abuse_report.rb

Streamline the "Report button"

2015-09-29 21:47:01 +02:00

application_setting.rb

Merge branch 'fix-application-settings-not-expiring' into 'master'

2015-12-04 14:36:30 -05:00

audit_event.rb

Re-annotate models

2015-08-03 01:52:54 +09:00

broadcast_message.rb

Explicitly define ordering in models using default_scope

2015-02-05 14:20:55 -08:00

commit_range.rb

Add reference_pattern to Referable models

2015-05-26 15:48:32 -04:00

commit_status.rb

Annotate models

2015-11-13 19:22:46 +01:00

commit.rb

Merge branch 'webhook_payload_with_changes' into 'master'

2015-12-07 14:31:49 -05:00

deploy_key.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

deploy_keys_project.rb

Clean up code.

2015-04-03 12:28:47 +02:00

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

2014-03-27 09:15:25 +13:00

email.rb

Allow primary email to be set to an email that you've already added.

2015-04-30 16:17:03 +02:00

event.rb

Merge branch 'atom-feed-latest-update' into 'master'

2015-11-20 11:02:27 +01:00

external_issue.rb

Add reference_pattern to Referable models

2015-05-26 15:48:32 -04:00

forked_project_link.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

generic_commit_status.rb

Annotate models

2015-11-13 19:22:46 +01:00

global_label.rb

Refactor global and group milestones logic

2015-11-16 14:07:38 +01:00

global_milestone.rb

Merge branch 'fix-global-milestones-error-500' into 'master'

2015-12-07 14:28:31 -05:00

group.rb

Merge branch 'atom-feed-latest-update' into 'master'

2015-11-20 11:02:27 +01:00

identity.rb

Validate presence of provider field in Identity

2015-06-23 11:21:23 +02:00

issue.rb

Only accept open issues and merge requests

2015-10-16 09:59:32 +02:00

key.rb

Only publish ssh key-type and key

2015-08-04 14:33:18 +02:00

label_link.rb

Annotate models

2014-08-25 12:25:02 +03:00

label.rb

Annotate models

2015-11-13 19:22:46 +01:00

lfs_object.rb

Add support for git lfs.

2015-11-16 12:39:13 +01:00

lfs_objects_project.rb

Add support for git lfs.

2015-11-16 12:39:13 +01:00

member.rb

Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master'

2015-11-17 13:24:15 -05:00

merge_request_diff.rb

Add ignore white space option in merge request diff

2015-11-13 16:53:53 +09:00

merge_request.rb

Merge branch 'webhook_payload_with_changes' into 'master'

2015-12-07 14:31:49 -05:00

milestone.rb

Improve performance of sorting milestone issues

2015-10-19 11:37:14 +02:00

namespace.rb

Annotate models

2015-11-13 19:22:46 +01:00

note.rb

Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'

2015-12-07 14:33:36 -05:00

notification.rb

Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications

2015-09-16 19:46:24 -05:00

personal_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_import_data.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

project_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_team.rb

Improve ProjectTeam#max_member_access performance

2015-10-15 12:05:01 +02:00

project_wiki.rb

Make ProjectWiki touch Project#last_activity_at after wiki actions

2015-11-16 13:08:25 -05:00

project.rb

Merge branch 'atom-feed-latest-update' into 'master'

2015-11-20 11:02:27 +01:00

protected_branch.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

release.rb

Annotate models

2015-11-13 19:22:46 +01:00

repository.rb

Merge branch 'upload_hook' into 'master'

2015-11-30 14:05:35 -05:00

security_event.rb

Re-annotate models

2015-08-03 01:52:54 +09:00

sent_notification.rb

Merge branch 'master' into rename-reply-by-email

2015-09-21 10:35:56 +02:00

service.rb

Improve invalidation of stored service password if the endpoint URL is changed

2015-10-15 12:07:59 +02:00

snippet.rb

Make snippet filename optional.

2015-06-20 01:06:57 +02:00

subscription.rb

tests

2015-03-16 21:38:41 +02:00

tree.rb

Rename MarkdownHelper to MarkupHelper

2015-05-18 22:51:56 +02:00

user.rb

Merge branch 'atom-feed-latest-update' into 'master'

2015-11-20 11:02:27 +01:00

users_star_project.rb

Annotate models

2014-08-25 12:25:02 +03:00

wiki_page.rb

Fix dots in Wiki slug causing errors

2015-03-21 18:33:51 -07:00