Commit graph

8 commits

Author SHA1 Message Date
GitLab Bot
70cfa5e3e7 Add latest changes from gitlab-org/gitlab@master 2021-04-26 21:10:25 +00:00
Stan Hu
58c09eb709 Use a path for the related merge requests endpoint
Hosts using a non-standard configuration may have a different
hostname/port/scheme than what may be configured on the GitLab
server. While expose_url should generate a proper URL, there are cases
where it may not work. Since we don't need the full URL, we can use the
relative path.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61280
2019-05-07 06:16:39 -07:00
gfyoung
3836d69119 Enable frozen string in lib/api and lib/backup
Partially addresses #47424.

Had to make changes to spec files because
stubbing methods on frozen objects is a mess
in RSpec and leads to failures:

https://github.com/rspec/rspec-mocks/issues/1190
2018-09-29 21:04:50 -07:00
Stan Hu
990af4fb5d Replace grape-route-helpers with our own grape-path-helpers
This gem (https://gitlab.com/gitlab-org/grape-path-helpers) makes a number of changes:

1. Brings in @mdelaossa's changes in https://github.com/reprah/grape-route-helpers/pull/21
2. Fixes some broken specs and code for Grape 1.0+
3. Optimizes the generation of paths by bringing in @dblessing's
   HashWithIndifferentAccess changes in https://gitlab.com/gitlab-org/gitlab-ce/issues/45718#note_70123793

Closes #45718
2018-05-30 03:15:03 -07:00
Francisco Javier López
0af4c56cff Fix expose_url helper does not include custom base url if it is set 2018-05-22 08:54:20 +00:00
Toon Claes
3802006436 Respect the protocol in expose_url
When https is configured in the URL, also use that, and do not set it
to http.

Closes gitlab-org/gitlab-ee#5217
2018-03-12 15:34:11 +01:00
Rémy Coutable
60797a42b4 Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28 16:33:30 +02:00
Oswaldo Ferreira
33dc5171e5 Resolve "More RESTful API: include resource URLs in responses" 2017-07-25 09:35:45 +00:00