summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-08-07 19:22:41 +0000
committerRobert Speicher <robert@gitlab.com>2017-08-07 19:22:41 +0000
commit4e2b630df716174ea9b07319a0fd5eda7b60cf8e (patch)
treec3d1a509818b86bc8bbc96cb84bae8113cfe7868 /config
parentbc648ae5d225b3b76cc3105681e2f404a5918f85 (diff)
parentdf00ebded67e871dfab226db3ffadc3dd6807d79 (diff)
downloadgitlab-ce-4e2b630df716174ea9b07319a0fd5eda7b60cf8e.tar.gz
Merge branch 'group-milestone-references-system-notes' into 'master'
Support group milestone references Closes #34778 See merge request !13289
Diffstat (limited to 'config')
-rw-r--r--config/application.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index f7145566262..47887bf8596 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -181,7 +181,11 @@ module Gitlab
end
end
+ # We add the MilestonesRoutingHelper because we know that this does not
+ # conflict with the methods defined in `project_url_helpers`, and we want
+ # these methods available in the same places.
Gitlab::Routing.add_helpers(project_url_helpers)
+ Gitlab::Routing.add_helpers(MilestonesRoutingHelper)
end
end
end