diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-30 14:09:38 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-05-30 14:09:38 +0000 |
| commit | 2c977029feb756955235f16a06e46d20adb1f557 (patch) | |
| tree | 7c7990bfcb52969eb35ee88ac8ccf456d151a0ca /config | |
| parent | c53da5e9197df5fa9712fdee679da7f1b3c3224c (diff) | |
| parent | 990af4fb5dcc08894578cc7d1dd24176c1cbcef2 (diff) | |
| download | gitlab-ce-2c977029feb756955235f16a06e46d20adb1f557.tar.gz | |
Merge branch 'sh-use-grape-path-helpers' into 'master'
Replace grape-route-helpers with our own grape-path-helpers
Closes #45718
See merge request gitlab-org/gitlab-ce!19240
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/grape_route_helpers_fix.rb | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/config/initializers/grape_route_helpers_fix.rb b/config/initializers/grape_route_helpers_fix.rb deleted file mode 100644 index 612cca3dfbd..00000000000 --- a/config/initializers/grape_route_helpers_fix.rb +++ /dev/null @@ -1,51 +0,0 @@ -if defined?(GrapeRouteHelpers) - module GrapeRouteHelpers - module AllRoutes - # Bringing in PR https://github.com/reprah/grape-route-helpers/pull/21 due to abandonment. - # - # Without the following fix, when two helper methods are the same, but have different arguments - # (for example: api_v1_cats_owners_path(id: 1) vs api_v1_cats_owners_path(id: 1, owner_id: 2)) - # if the helper method with the least number of arguments is defined first (because the route was defined first) - # then it will shadow the longer route. - # - # The fix is to sort descending by amount of arguments - def decorated_routes - @decorated_routes ||= all_routes - .map { |r| DecoratedRoute.new(r) } - .sort_by { |r| -r.dynamic_path_segments.count } - end - end - - class DecoratedRoute - # GrapeRouteHelpers gem tries to parse the versions - # from a string, not supporting Grape `version` array definition. - # - # Without the following fix, we get this on route helpers generation: - # - # => undefined method `scan' for ["v3", "v4"] - # - # 2.0.0 implementation of this method: - # - # ``` - # def route_versions - # version_pattern = /[^\[",\]\s]+/ - # if route_version - # route_version.scan(version_pattern) - # else - # [nil] - # end - # end - # ``` - def route_versions - return [nil] if route_version.nil? || route_version.empty? - - if route_version.is_a?(String) - version_pattern = /[^\[",\]\s]+/ - route_version.scan(version_pattern) - else - route_version - end - end - end - end -end |