diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 06:06:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 06:06:35 +0300 |
| commit | d14219486e0f3b6e642eaeff0862dea169e5d260 (patch) | |
| tree | 6c8536e27d0abb3844414a18b1478c28116d42a7 /app | |
| parent | 587794b4b8a6e919e77ee4abe8215fa291e6a91d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/graphql/types/issue_type.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/graphql/types/issue_type.rb b/app/graphql/types/issue_type.rb index 432f3e1255f..4965601fe65 100644 --- a/app/graphql/types/issue_type.rb +++ b/app/graphql/types/issue_type.rb @@ -49,7 +49,6 @@ module Types field :web_url, GraphQL::STRING_TYPE, null: false # rubocop:disable Graphql/Descriptions field :relative_position, GraphQL::INT_TYPE, null: true # rubocop:disable Graphql/Descriptions - field :epic, ::Types::EpicType, null: true, description: 'The epic to which issue belongs' field :participants, Types::UserType.connection_type, null: true, complexity: 5, description: 'List of participants for the issue' field :time_estimate, GraphQL::INT_TYPE, null: false, description: 'The time estimate on the issue' field :total_time_spent, GraphQL::INT_TYPE, null: false, description: 'Total time reported as spent on the issue' diff --git a/app/models/user.rb b/app/models/user.rb index f5fbc912cc8..ad56d7a32c5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -444,6 +444,7 @@ class User < ApplicationRecord # # Returns an ActiveRecord::Relation. def search(query) + query = query&.delete_prefix('@') return none if query.blank? query = query.downcase |