| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
deleted and added
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>
|
| |
|
|
|
| |
In this case comparing old_path and new_path is not enough because there
are two entires that match.
|
| |
|
|
|
| |
Previously, we were calling `git update-ref <ref> <sha>` about 30 times per
test using `create(:project)` or similar.
|
| |\ |
|
| | | |
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |/ |
|
| | |
|
| |
|
|
|
|
| |
Forks may not be up-to-date with the target project, and so might not
contain one of the parent refs in their repo. Fetch this if it isn't
present.
|
| |
|
|
|
|
|
| |
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.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Closes #20440
|
| |
|
|
| |
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
| | |
|
| |
|
|
|
| |
MySQL's text column isn't big enough for the diffs in the
expand-collapse-diffs branch.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
| |
is published
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
This reverts commit b435d7405364d28ec364072f4437512da2876762.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
mark
Here was the problem:
1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file.
2. If the blob is text, GitLab will attempt to display it.
3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters.
4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT.
To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires
an update to gitlab_git: gitlab-org/gitlab_git!86
Closes #13826
|
| |
|
|
| |
Closes #14875
|
| |
|
|
|
|
|
|
|
|
|
| |
The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.
Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.
|
| |\
| |
| |
| |
| |
| |
| | |
Serve LFS object
Depends on gitlab-org/gitlab_git!57
See merge request !1976
|
| | | |
|
| | | |
|
| |/ |
|
| |
|
|
| |
Closes #3311
|
| |
|
|
|
|
| |
leading dot
Closes https://github.com/gitlabhq/gitlabhq/issues/8763
|
| | |
|
| | |
|
| |
|
|
| |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |\
| |
| |
| | |
backup-archive-permissions
|
| | |
| |
| |
| | |
Closes #1724
|
| |\ \
| |/
| |
| | |
backup-archive-permissions
|
| | |
| |
| |
| | |
Closes #1362
|
| |/ |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
submodules
Closes #1413
|
| |
|
|
|
|
|
|
|
| |
See http://schacon.github.io/git/git-init.html#_template_directory
Without this variable, any global git hooks a developer might have in
~/.git_template would be linked in the `.git/hooks` folder for every
test repository that gets checked out by TestEnv, and would cause
certain specs to fail due to pre-existing hook files.
|
| |
|
|
|
|
| |
- Simplify cleaning the temporary testing path in TestEnv
- Don't run gitlab:shell:install if it's already installed
- Run git commands quietly
|
| |
|
|
| |
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
| | |
|
