Grzegorz Bizon 359d94607c 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 12:26:56 +00:00

..

admin

Be more explicit with the impersonate return URL

2015-12-02 13:21:07 -05:00

ci

Don't rescue Exception, but StandardError

2015-11-19 20:17:17 +01:00

concerns

Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit

2015-11-18 11:17:20 +01:00

dashboard

Refactor global and group milestones logic

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

explore

Clean up overlap between dashboard and explore.

2015-09-08 14:49:20 +01:00

groups

Fix Error 500 when creating global milestones with Unicode characters

2015-12-05 00:04:44 -08:00

import

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

oauth

Move helpers back to original directory

2015-09-09 14:37:34 +02:00

profiles

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

projects

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

2015-12-07 12:26:56 +00:00

sherlock

Added Sherlock, a custom profiling tool for GitLab

2015-11-09 14:29:10 +01:00

abuse_reports_controller.rb

fix specs

2015-11-30 16:12:31 +02:00

application_controller.rb

Add "Start a new merge request" option to every commit form

2015-11-17 18:53:56 +01:00

autocomplete_controller.rb

Update autocomplete_controller to be more readable

2015-11-22 06:04:20 -02:00

confirmations_controller.rb

Add invites controller.

2015-04-14 12:07:33 +02:00

dashboard_controller.rb

Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb

2015-11-17 11:03:18 +01:00

groups_controller.rb

Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb

2015-11-17 11:03:18 +01:00

help_controller.rb

Simplify help path prefixing

2015-09-23 00:24:17 -04:00

invites_controller.rb

Redirect to a default path if HTTP_REFERER is not set

2015-10-20 07:45:48 -07:00

namespaces_controller.rb

Allow access to group from root url

2015-09-14 11:16:54 +02:00

omniauth_callbacks_controller.rb

Fix rubocop warnings in app

2015-10-03 00:56:37 -05:00

passwords_controller.rb

Refactor PasswordsController to use before_actions

2015-10-01 21:47:27 -04:00

profiles_controller.rb

Notify user if they cannot create projects

2015-12-05 11:32:08 -05:00

projects_controller.rb

Fix 404 in redirection after removing a project

2015-11-25 23:11:35 -08:00

registrations_controller.rb

Fix error when deleting a user who has projects

2015-06-23 04:39:49 -07:00

root_controller.rb

Add user preference to view project activity and starred project activity as default dashboard

2015-09-26 08:46:05 -07:00

search_controller.rb

Add support for searching commit log messages

2015-10-28 22:34:39 -04:00

sessions_controller.rb

Bump devise-two-factor to 2.0.0

2015-09-19 21:16:18 -04:00

snippets_controller.rb

Fix raw private snippets access workflow

2015-11-25 18:16:27 -02:00

uploads_controller.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

users_controller.rb

Refactor UsersController to not kill the database

2015-11-18 13:05:45 +01:00