diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-07 10:43:37 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-07 10:43:37 -0500 |
| commit | c81928cfa757b6f42debd6d1c3b6cdb860fc14f5 (patch) | |
| tree | 2069795e9fce322b3ab27a20c54dd8348fd4277a /lib/gitlab/conflict | |
| parent | 1dab640357fa1ba8992757499e4167fcd4ce6276 (diff) | |
| download | gitlab-ce-c81928cfa757b6f42debd6d1c3b6cdb860fc14f5.tar.gz | |
Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-production
Diffstat (limited to 'lib/gitlab/conflict')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index d2b4e6e209e..98dfe900044 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -1,7 +1,7 @@ module Gitlab module Conflict class File - include Gitlab::Routing.url_helpers + include Gitlab::Routing include IconsHelper MissingResolution = Class.new(ResolutionError) |