Change the approach to check if patches apply cleanly (!6949) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Snippets Groups Projects

Merged Rémy Coutable requested to merge 23372-fix-ce-to-ee-merge-check-task into master 8 years ago

All threads resolved!

What does this MR do?

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

CHANGELOG entry added
Documentation created/updated
API support added
Tests
- Added for this feature/bug
- All builds are passing
Conform by the merge request performance guides
Conform by the style guides
Branch has no merge conflicts with master (if it does - rebase it please)
Squashed related commits together

What are the relevant issue numbers?

Closes #23372 (closed)

Activity

Rémy Coutable @rymai started a thread on an old version of the diff 8 years ago

Resolved 8 years ago by Robert Speicher
Last reply by Rémy Coutable 8 years ago

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

a5097540 - Fetch master before generating the patch

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

a5097540 - Fetch master before generating the patch

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

a5097540 - Fetch master before generating the patch

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

bd03f891 - Remove uneccessary spaces

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

bd03f891 - Remove uneccessary spaces

Compare with previous version

Rémy Coutable Mentioned in issue #23371 (closed) 8 years ago

Mentioned in issue #23371 (closed)

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

157a53e6 - Log the fetching

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

04754e5e - Log the fetching

Compare with previous version

Rémy Coutable Mentioned in issue #23568 (closed) 8 years ago

Mentioned in issue #23568 (closed)

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

19259697 - Simplify and log more

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

82f2ef10 - Simplify and log more

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

02226a83 - Clean and fix the implementation

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

cd4ab7ef - Clean and fix the implementation

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

a09fefd4 - Clean and fix the implementation

Compare with previous version

Rémy Coutable Added 494 commits: 8 years ago

Added 494 commits:

a09fefd4...6ff3625f - 493 commits from branch master
b433422e - Change the approach to check if patches apply cleanly

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

12115682 - Change the approach to check if patches apply cleanly

Compare with previous version

Rémy Coutable @rymai · 8 years ago

Author Maintainer

@rspeicher I think this is now in a working state, I've simplified and solidified the task a bit. Let me know what you think!

Rémy Coutable Unmarked this merge request as a Work In Progress 8 years ago

Unmarked this merge request as a Work In Progress

Rémy Coutable Added ~506179 and removed ~157391 labels 8 years ago

Added ~506179 and removed ~157391 labels

Rémy Coutable Milestone changed to 8 years ago

Milestone changed to %8.14

Rémy Coutable Reassigned to @rspeicher 8 years ago

Reassigned to @rspeicher

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

af669cbe - Change the approach to check if patches apply cleanly

Compare with previous version

Robert Speicher Resolved all discussions 8 years ago

Resolved all discussions

Robert Speicher @rspeicher started a thread on an old version of the diff 8 years ago

Resolved 8 years ago by Rémy Coutable

Robert Speicher @rspeicher started a thread on the diff 8 years ago

Resolved 8 years ago by Robert Speicher

Rémy Coutable Added ~889916 label 8 years ago

Added ~889916 label

Rémy Coutable Resolved all discussions 8 years ago

Resolved all discussions

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

c7af4cf8 - Don't print out implementation detail step

Compare with previous version

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

c7af4cf8 - Don't print out implementation detail step

Compare with previous version

Robert Speicher @rspeicher started a thread on an old version of the diff 8 years ago

Resolved 8 years ago by Rémy Coutable

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

c7af4cf8 - Don't print out implementation detail step

Compare with previous version

Robert Speicher @rspeicher · 8 years ago

Contributor

@rymai Sorry, one more nitpick!

Robert Speicher Reassigned to @rymai 8 years ago

Reassigned to @rymai

Rémy Coutable Resolved all discussions 8 years ago

Resolved all discussions

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

402dcab4 - Use File.write instead of File.open + File#write

Compare with previous version

Robert Speicher Enabled an automatic merge when the build for succeeds 8 years ago

Enabled an automatic merge when the build for 402dcab4 succeeds

Robert Speicher @rspeicher · 8 years ago

Contributor

@rymai LGTM! Do we have docs for this yet, or are we waiting until it's working as expected?

Rémy Coutable Mentioned in issue #23740 (closed) 8 years ago

Mentioned in issue #23740 (closed)

Rémy Coutable @rymai · 8 years ago

Author Maintainer

@rspeicher Thanks! Hmm, no there's no doc for this yet. But I will definitely add this under https://docs.gitlab.com/ce/development/README.html. Created an issue via our awesome Issue Board feature! :)

Rémy Coutable Reassigned to @rspeicher 8 years ago

Reassigned to @rspeicher

Robert Speicher @rspeicher · 8 years ago

Contributor

@rymai RuboCop failures. We might want to encapsulate the output to a single helper method that calls puts and then we can wrap it in a rubocop:disable ... rubocop:enable block comment.

Robert Speicher Reassigned to @rymai 8 years ago

Reassigned to @rymai

Rémy Coutable Added 1 commit: 8 years ago

Added 1 commit:

d38d4a9e - Disable Rails/Output cop since it makes no sense here

Compare with previous version

Rémy Coutable @rymai · 8 years ago

Author Maintainer

@rspeicher I've disabled the cop entirely (d38d4a9e) since it makes no sense to have it in this case, ok for you?

Rémy Coutable Reassigned to @rspeicher 8 years ago

Reassigned to @rspeicher

Robert Speicher @rspeicher · 8 years ago

Contributor

@rymai Works for me!

Robert Speicher Mentioned in commit 8 years ago

Mentioned in commit nvan/gitlab-ce@ea8aa34b

Robert Speicher @rspeicher · 8 years ago

Contributor

This MR was in a locked state. I used the console to manually unlock it (.unlock_mr!) and then mark it as merged (.mark_as_merged!).

See https://gitlab.com/gitlab-org/gitlab-ce/commit/ea8aa34b55f9029a823c6210258f8552fcaababe

Please register or sign in to reply