7550f60dde
Backport changes from EE squash
...
Backport changes from the EE-only squash implementation, which would
otherwise conflict when merge CE into EE.
<https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1024 >
2017-02-03 09:46:03 +00:00
e7d530a624
Merge branch 'fix-git-hooks-when-creating-file' into 'master'
...
Don't execute git hooks if you create branch as part of other change
Closes #23439
See merge request !7237
2017-02-02 23:26:35 +00:00
ceb1ebd959
Active tense test coverage
...
Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
2017-02-01 22:45:41 +00:00
406dfd6e0f
Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file
...
* upstream/master:
Ensure we have a project with a repo in GitlabMarkdownHelper specs
Revert "Make sure TraceReader uses Encoding.default_external"
Make sure TraceReader uses Encoding.default_external
Update CONTRIBUTING.md after merging "up-for-grabs" and "Accepting Merge Requests" [ci skip]
Use `:empty_project` where possible in finder specs
Use `empty_project` where possible in controller specs
Use `:empty_project` where possible in helper specs
Don’t count tasks that are not defined as list items correctly
Use a project factory with a repository where necessary
Use `:empty_project` where possible throughout spec/lib
Use hashrocket for dasherized attribute
Remove markdown file extension and add anchor to link
Fixed builds info link on project settings page
Factories with a project association use `:empty_project` by default
Update enviroments.md the example for deleting an environment is missing the "s" in environments. curl --request DELETE --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/environments/1 " wil 404
2017-01-26 22:19:50 +08:00
80a6d2fda2
Use `:empty_project` where possible throughout spec/lib
2017-01-25 12:25:42 -05:00
a639454032
Fix renaming
2017-01-07 00:31:11 +08:00
1e5e56c698
Fix MR with files hidden by .gitattributes
...
Don't try to highlight and cache files hidden by .gitattributes entries.
2016-12-26 16:25:55 +00:00
f5d7a61760
Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass
2016-12-02 14:03:30 +02:00
847ada36c4
Fix: Timeout creating and viewing merge request for binary file
2016-11-25 15:25:01 +02:00
0f61bb2dc5
Fix Error 500 when creating a merge request that contains an image that was 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>
2016-11-14 15:57:01 +01:00
4a4c1765be
Fix line commenting for the initial commit
...
The initial commit doesn't have a parent, so explicitly pass the blank
SHA and handle that when calculating the position.
2016-08-19 16:35:44 +01:00
c86c1905b5
switch from diff_file_collection to diffs
...
So we have raw_diffs too
2016-08-03 07:00:20 +02:00
79214be727
Add Discussion model to represent MR/diff discussion
2016-07-20 16:18:18 -06:00
4f0780cc04
Ensure to_json methods take optional argument
2016-07-20 11:14:06 +01:00
f0b446e555
Merge branch '19820-safer-diffs' into 'master'
...
Collapsed diffs lines/size don't accumulate to overflow diffs.
## What does this MR do?
Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by !4990 as you can see on the issue description #19820 .
We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files).
We still need to bump the gitlab_git and point this branch to the new gitlab_git version.
## What are the relevant issue numbers?
Closes #19820
Closes #19885
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG ) entry added
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md )~~
- ~~[ ] API support added~~
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
See merge request !5306
2016-07-18 21:28:24 +00:00
a404ab380d
Collapsed diffs lines/size don't accumulate to overflow diffs.
2016-07-18 14:43:28 -06:00
2cf7f09b1e
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'
""
...
This reverts commit 530f5158e2!4892 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-18 10:16:56 +02:00
e9f191907c
apparently this gets encoded now?
2016-07-14 10:08:15 -07:00
ff7e679bca
we no longer encode double-quotes
2016-07-14 10:08:15 -07:00
530f5158e2
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
...
This reverts commit 9ca633eb4cfb229bbf79
2016-07-13 13:57:30 -05:00
495db09653
Enforce "developers can merge" during `pre-receive`.
...
1. When a merge request is being merged, save the merge commit SHA in
the `in_progress_merge_commit_sha` database column.
2. The `pre-receive` hook looks for any locked (in progress) merge
request with `in_progress_merge_commit_sha` matching the `newrev` it
is passed.
3. If it finds a matching MR, the merge is legitimate.
4. Update `git_access_spec` to test the behaviour we added here. Also
refactored this spec a bit to make it easier to add more contexts / conditions.
2016-07-13 13:24:56 +05:30
5fea640e90
Merge branch 'multi-line-inline-diff' into 'master'
...
Render inline diffs for multiple changed lines following eachother
Before:
After:
See merge request !5174
2016-07-13 05:29:49 +00:00
adc6ec4a9c
Avoid `describe`-ing symbols in specs
2016-07-12 10:27:58 -05:00
f5cc3f63a8
Render inline diffs for multiple changed lines following eachother
2016-07-11 18:58:15 -05:00
e0ecfe5bd1
Add tests for Position
2016-07-06 18:51:01 -04:00
ebb5f591e3
Add tests for PositionTracer
2016-07-06 18:51:00 -04:00
e9e06ca627
Add Gitlab::Diff::LineMapper
2016-07-06 18:50:59 -04:00
a9fa45f09e
Represent DiffRefs as proper class instead of tuple array
2016-07-06 18:50:58 -04:00
9e211091a8
Enable Style/EmptyLines cop, remove redundant ones
2016-07-01 21:56:17 +02:00
3f0d780c19
Show a notice for diffs that are too large
...
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
2016-03-18 12:30:46 +01:00
7e03b40221
Return an empty Array when there aren't lines to parse.
2016-03-15 19:51:27 -05:00
1764e1b7cb
Use Gitlab::Git::DiffCollections
2016-03-03 18:38:44 +01:00
fa0cbb1399
Fix specs and add a new one
2016-01-30 12:53:12 +01:00
677b4db9e6
Mark inline difference between old and new paths when a file is renamed
2016-01-29 19:37:17 +01:00
26f7d023e6
Update tests
2016-01-20 17:14:26 +01:00
a010db5db2
Properly handle HTML entities with inline diffs
2016-01-20 15:26:44 +01:00
701513dcc7
Move parallel diff logic to separate class
2016-01-20 14:53:20 +01:00
512bebe21d
Refactor Gitlab::Highlight and fix tests
2016-01-19 14:52:41 +01:00
12546f895f
Add tests
2016-01-15 16:29:26 +01:00
6b9c730e91
More refactoring from last code review. #3945
...
* Use commit objects instead of IDs when generating diffs
* Use proper references when generating MR's source and target
* Update broken specs
2016-01-14 16:47:55 -05:00
8dfad143d4
Add inline diff markers in highlighted diffs.
2016-01-14 22:28:07 +01:00
f547e733d1
Add more specs. #3945
2016-01-12 17:49:11 -05:00
78d7c0e0d8
Fix broken specs. #3945
2016-01-08 19:05:55 -05:00
52f8286a02
Update specs. #3945
2016-01-08 18:40:05 -05:00
3fbcf52ec8
Apply syntax highlighting when expanding diff plus some refactor. #3945
2015-12-31 01:05:52 -05:00
fd100e1ef1
Don't modify "match" diff lines. #3945
2015-12-30 21:44:12 -05:00
8b079315d9
A bit of refactoring. #3945
2015-12-30 21:23:50 -05:00
d83275620a
Add specs for Gitlab::Diff::Highlight. #3945
2015-12-30 20:18:40 -05:00
13d6bab177
Tag lib specs
2015-12-09 11:55:42 +01:00
3c16fb93fc
Move spec to proper place and fix unused variable
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 09:45:21 +01:00
Sean McGivern
Douwe Maan
Valery Sizov
Lin Jen-Shin
Robert Speicher
Stan Hu
Paco Guzman
Douwe Maan
Rémy Coutable
http://jneen.net/
Timothy Andrew
Grzegorz Bizon
Yorick Peterse
Rubén Dávila
Jacob Vosmaer
Dmitriy Zaporozhets