summaryrefslogtreecommitdiff
path: root/lib/gitlab.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-24 15:08:05 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-24 15:08:05 +0000
commit2a6227a9fca46ca5c982f1cb75754fb1c722b360 (patch)
treee1f1c3386336fdd24f6445134989161b3681c17b /lib/gitlab.rb
parent03bd3081cafe249d9e8c73999411ce9999466c37 (diff)
parentb0498c176fa134761d899c9b369be12f1ca789c5 (diff)
downloadgitlab-ce-2a6227a9fca46ca5c982f1cb75754fb1c722b360.tar.gz
Merge branch 'dm-fix-routes' into 'master'
Fix ambiguous routing issues by teaching router about reserved words See merge request !11570
Diffstat (limited to 'lib/gitlab.rb')
0 files changed, 0 insertions, 0 deletions