Commit Graph

17 Commits

Author SHA1 Message Date
GitLab Bot a0b4a462b0 Add latest changes from gitlab-org/gitlab@master 2021-03-17 21:11:29 +00:00
GitLab Bot 770adf9251 Add latest changes from gitlab-org/gitlab@master 2021-03-04 15:11:19 +00:00
GitLab Bot 9c72b346ac Add latest changes from gitlab-org/gitlab@master 2020-10-15 09:08:41 +00:00
GitLab Bot 6b9d3a4e83 Add latest changes from gitlab-org/gitlab@master 2020-01-29 18:08:47 +00:00
GitLab Bot 8320f7956d Add latest changes from gitlab-org/gitlab@master 2019-09-27 15:06:16 +00:00
Thong Kuah f0391c2517 Add frozen_string_literal to spec/support
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-25 17:33:34 +12:00
Mike Greiling 89142f985d
Move frontend fixtures to tmp/tests 2019-07-19 02:27:14 -05:00
Winnie Hellmann d14e25e955 Call store_frontend_fixture() in JavaScriptFixturesHelpers 2019-05-10 14:12:19 +02:00
Winnie Hellmann 1542904541 Generate EE frontend fixtures into ee/ directory
(cherry picked from commit d4ce3c720ecb52f2a9153133bbd47fa358c5d7b6)
2019-05-02 23:11:18 +02:00
Winnie Hellmann ad985a7a28 Merge branch 'winh-remove-sushi' into 'master'
Remove .raw from JavaScript fixture file names

Closes #59201

See merge request gitlab-org/gitlab-ce!26430

(cherry picked from commit 79a45f7f02)
2019-03-26 16:03:28 +00:00
Filipa Lacerda 022968764c Revert "Merge branch 'winh-remove-sushi' into 'master'"
This reverts merge request !26430
2019-03-22 11:03:15 +00:00
Winnie Hellmann 3e9bb4ad31 Remove .raw from JavaScript fixture file names
There is nothing more to say but

"Commits that change 30 or more lines across at least three files
must describe these changes in the commit body"
2019-03-21 17:16:53 +01:00
Rémy Coutable b789bfaeef
Simplify the JavaScriptFixturesHelpers module
- Only storing fixtures in one place
- This place changes whether we are in CE or EE

We discovered with @winh that only fixtures located under
spec/javascripts/fixtures are used, even in EE so there's no need to
clean/create fixtures in ee/spec/javascripts/fixtures.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-19 08:46:22 +01:00
Rémy Coutable f5e80ed6b2
Reduce differences in spec/support/helpers/javascript_fixtures_helpers.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-03-07 08:13:37 +01:00
Winnie Hellmann d32e91d0cf Set a fixed date for frontend fixtures 2018-12-10 13:47:38 +01:00
Zeger-Jan van de Weg ec4423665c
Gitlab::Shell works on shard name, not path
Direct disk access is done through Gitaly now, so the legacy path was
deprecated. This path was used in Gitlab::Shell however. This required
the refactoring in this commit.

Added is the removal of direct path access on the project model, as that
lookup wasn't needed anymore is most cases.

Closes https://gitlab.com/gitlab-org/gitaly/issues/1111
2018-04-25 13:36:22 +02:00
Rémy Coutable 023d4f6f2f
Move spec helpers/matchers/shared examples/contexts to their relevant folder
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-23 12:20:30 +02:00