diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-06-20 12:39:13 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-06-20 12:39:13 +0300 |
| commit | c8611fb2617de3112a49b7638b9bbf99054980bb (patch) | |
| tree | b7366ab2d1e37c88c0a5275203b3748e7e0d19ec /app/serializers | |
| parent | 1688d7d0e1196af575986b5cd1c6b429ff0b1594 (diff) | |
Resolve some of the conflicts[co skip]
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/group_entity.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/serializers/group_entity.rb b/app/serializers/group_entity.rb index 4dbcb416ee7..7c872a3e986 100644 --- a/app/serializers/group_entity.rb +++ b/app/serializers/group_entity.rb @@ -10,11 +10,7 @@ class GroupEntity < Grape::Entity expose :parent_id expose :created_at, :updated_at -<<<<<<< HEAD - expose :web_url do |group| -======= expose :group_path do |group| ->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31 group_path(group) end |