Also disabled assets warming for Capybara/RSpec and remove a check to
skip assets warming when ./tmp/cache/assets/test exists because assets
are now served by webpack-dev-server.
Signed-off-by: Rémy Coutable <remy@rymai.me>
This will be necessary when adding gitaly settings. This version
doesn't make any functional changes, but allows us to include this
breaking change in 9.0 and add the needed extra settings in the future
with backwards compatibility
Steps to reproduce:
1. Start with a repo with an image
2. Add a commit to delete the image
3. Add another commit to replace the image with another image
In a diff comparison, we really just compare about what the image was before the diff, not
the direct parent of the last commit. This MR fixes that.
Closes#3893, gitlab-org/gitlab-ee#678
Signed-off-by: Rémy Coutable <remy@rymai.me>
gitlab-git-test `master` was updated in ff076d88, and this caused
the merge request diffs to change in a way that broke assumptions in the
Spinach tests.
Partial fix to #23378
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
Note: This feature was developed independently on master while this was
in review. I've removed the conflicting bits and left the relevant
additions, mainly a test for `Gitlab::Git::Hook`. The original commit
message follows:
1. `gitlab-shell` outputs errors to `stderr`, but we weren't using this
information, prior to this commit. Now we capture the `stderr`, and
display it in the flash message when branch creation fails.
2. This can be used to display better errors for other git operation
failures with small tweaks.
3. The return value of `Gitlab::Git::Hook#trigger` is changed from a
simple `true`/`false` to a tuple of `[status, errors]`. All usages
and tests have been updated to reflect this change.
4. This is only relevant to branch creation _from the Web UI_, since SSH
and HTTP pushes access `gitlab-shell` either directly or through
`gitlab-workhorse`.
5. A few minor changes need to be made on the `gitlab-shell` end. Right
now, the `stderr` message it outputs is prefixed by "GitLab: ", which
shows up in our flash message. This is better removed.
Luke "Jared" Bennett
Sam Rose
Rémy Coutable
Alejandro Rodríguez
Phil Hughes
Bob Van Landuyt
Stan Hu
Nick Thomas
Rémy Coutable
Sanster
Douwe Maan
Sean McGivern
jurre
Adam Niedzielski
Alfredo Sumaran
Valery Sizov
tiagonbotelho
winniehell
Paco Guzman
Timothy Andrew
http://jneen.net/