diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2015-09-16 19:54:18 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2015-09-16 19:54:18 -0500 |
| commit | 1ddefa3beabed00f08c893ca66b9f004e3b4e4df (patch) | |
| tree | 12c0546f4246b8ee5090c32996f3301207bcf93f /lib/api/entities.rb | |
| parent | 1ef2ce95d507c3d21598f26dd8a0e77dfc3c33cf (diff) | |
| parent | cac969229aab74ab5dcd7682c4f1c3a74a17b9d6 (diff) | |
| download | gitlab-ce-1ddefa3beabed00f08c893ca66b9f004e3b4e4df.tar.gz | |
Merge branch 'master' into notification-levels
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8dddcd7ccc3..33b6224a810 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -8,7 +8,7 @@ module API expose :id, :state, :avatar_url expose :web_url do |user, options| - Rails.application.routes.url_helpers.user_url(user) + Gitlab::Application.routes.url_helpers.user_url(user) end end @@ -81,7 +81,7 @@ module API expose :avatar_url expose :web_url do |group, options| - Rails.application.routes.url_helpers.group_url(group) + Gitlab::Application.routes.url_helpers.group_url(group) end end |