Commit Graph

36 Commits

Author SHA1 Message Date
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 25fa78e2f9
Backport line changes from EE
EE-specific line changes were introduced in the following MR:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12680

This change resolves most of them
2019-07-19 02:27:13 -05:00
Mike Greiling 37973465f5
Don't kill the fixtures directory between tests 2019-07-19 02:00:47 -05:00
Markus Koller 79c7eae39a
Fix broken handling for outdated test repos
The call to init had the side effect of starting another Gitaly process,
and didn't actually correctly delete the test repositories.
2019-07-18 12:01:51 +02:00
Aleksei Lipniagov 4085428ebd Gather memory usage data in tests
Log memory stats after running each spec file and compile the report.
2019-07-12 10:44:17 +00:00
Paul Okstad 7e2188a18e Change GetRawChanges RPC to use bytes 2019-06-27 13:35:13 +00:00
Zeger-Jan van de Weg 679ac7f78e
Disable hooks by setting an ENV var
Prior to this change, the hooks directory got cleared. That works, but
is not the way to go about it as there's a better way. Setting the env
var this commits sets.
2019-06-14 13:10:02 +02:00
Nick Thomas d2425716aa
CE backport for "Use gitlab-elasticsearch-indexer in tests" 2019-05-16 16:49:26 +01:00
Nick Thomas 9f05e97aad
Run rubocop -a 2019-03-13 13:42:43 +00:00
Jacob Vosmaer 078f11a6b9 Prepare test suite for switch to Gitaly-embedded Git hooks 2019-02-27 10:58:21 +00:00
Heinrich Lee Yu d03dee26b9 Refactor params for notes_actions
Removes unneeded params from permitted list

This also fixes commenting on commits with a hash starting with a large
number
2019-02-23 09:38:58 +08:00
Nick Thomas 3ee9bca503
Allow Gitaly to be built from a custom URL 2019-01-23 20:37:02 +00:00
Francisco Javier López 5a3e6fdff9
Fixing image lfs bug and also displaying text lfs
This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812,
fixes a problem creating a displaying image diff notes when the image
is stored in LFS. The main problem was that `Gitlab::Diff::File` was
returning an invalid valid in `text?` for this kind of files.

It also fixes a rendering problem with other LFS files, like text
ones. They LFS pointer shouldn't be shown when LFS is enabled
for the project, but they were.
2018-12-27 16:51:07 +01:00
Mark Chao 1f7647f446 Update merge request's merge_commit for branch update
Analyze new commits graph to determine each commit's merge commit.

Fix "merged with [commit]" info for merge requests being merged
automatically by other actions.

Allow analyzing upto the relevant commit
2018-12-07 19:24:34 +08:00
Douwe Maan 938d8900ad Merge branch 'zj-regenerate-gitaly-config-rspec' into 'master'
Regenerate Gitaly's config.toml each rspec run

See merge request gitlab-org/gitlab-ce!22562
2018-11-08 11:41:55 +00:00
Francisco Javier López 28cbb2acfe
Add submodule update API endpoint
This new endpoint allow users to update a submodule's reference.

The MR involves adding a new operation RPC operation in gitaly-proto
(see gitlab-org/gitaly-proto!233) and change Gitaly to use this
new version (see gitlab-org/gitaly!936).

See gitlab-org/gitlab-ce!20949
2018-11-07 14:03:30 +01:00
Mark Chao ea6fa65319 Add reference for branch for simple file operation
Suitable for testing old and new paths involved for each file in diff
2018-11-07 11:26:46 +08:00
Zeger-Jan van de Weg 6f4c1fd5a5
Regenerate Gitaly's config.toml each rspec run
This behaviour I removed in 08cdf65b9e, but this reverts this specific
line. In case storages, or other options changes which are set by the
Rails environment, this will easier to migrate to.

Storage paths is kept in plural, to support multiple storage in later
release for just testing purposes. But its probable that multi Gitaly
scenarios need to be tested.
2018-10-26 10:54:20 +02:00
Zeger-Jan van de Weg 3efaf5b56d
Hotfix for Rspec and second storage
Rails requires a second storage for testing cross shard features. Gitaly
will not boot if this second storage doesn't exist. So this will create
this storage without adding it to the list of storages that Rails knows
about.
2018-10-24 11:15:21 +02:00
Zeger-Jan van de Weg 08cdf65b9e
Remove broken git storage for testing
Broken storage used to be used to test situations where the Git storage
wasn't being reached. These days we can just mock the Gitaly response.

But given the broken storage is removed now, Gitaly can take over
control of the storage being reachable. If it's not, Gitaly won't boot.
That's nice for situations where a disk wasn't mounted for instance.

Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
2018-10-23 10:36:47 +02:00
Alessio Caiazza 4a9efc606f Move ci_environments_status to a model
GET :namespace/merge_requests/:id/ci_environments_status complexity
already reached a limit for a direct serialization from an hash
computed at within the controller function.

Here we introduce a virtual model EnvironmentStatus and its serializer.
2018-10-18 16:12:16 +02:00
Marcel Amirault 6876c7afa8 Fix grammar (setup to set-up) in code comments, spec, views, etc. 2018-09-17 09:17:33 +00:00
Alejandro Rodríguez d3c5b07962 Remove Rugged and shell code from Gitlab::Git 2018-09-12 12:32:32 -03:00
Bob Van Landuyt c826ecc3e7 Port changes for CODEOWNERS to CE
This ports the changes for the CODEOWNERS feature to CE:
- It adds the CODEOWNERS file.
- It adds the mention of the `with-codeowners` branch in TestEnv
2018-09-06 09:07:19 +02:00
Douwe Maan d9614e701a Merge branch 'gitaly-install-path' into 'master'
Remove storage path dependency of gitaly install task

See merge request gitlab-org/gitlab-ce!21101
2018-08-14 08:59:10 +00:00
Alejandro Rodríguez eb1a3798ad Remove storage path dependency of gitaly install task 2018-08-12 18:52:44 -03:00
Rémy Coutable 4e1b6d1eda Merge branch 'winh-fix-gpg-regressions' into 'master'
Fix GPG status badge loading regressions

Closes #49878, #49870, gitlab-org/quality/nightly#6 et #49831

See merge request gitlab-org/gitlab-ce!20987
2018-08-07 14:02:53 +00:00
Winnie Hellmann fed97a68b9 Fix GPG status badge loading regressions 2018-08-07 14:58:53 +02:00
Rubén Dávila 5c748a0bd9 Backport some changes from gitlab-org/gitlab-ee!6767 2018-08-07 06:13:48 -05:00
Alejandro Rodríguez 01de2b5df8 Refactor gitlab:import:repos task to remove direct disk access 2018-07-31 16:28:44 -04:00
Sean McGivern 57fc7cd8f3 Make sure ConflictsService does not raise for conflicting submodules 2018-07-10 15:06:20 +01:00
Jacob Vosmaer f376347f24 Find and mark more Git disk access locations, part 2 2018-06-12 14:33:37 +02:00
blackst0ne 4cff66a6c4 Add 'squash and rebase' feature to CE 2018-05-29 20:51:43 +11:00
Jacob Vosmaer (out of office May 10-14) d291f69fd9 Fix gitaly-ruby bundle poisoning in CI 2018-05-14 08:10:29 +00: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