home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,116 Commits 48 Branches 340 Tags
169070ba4b83b1cbb4084abcf8ffeb9f492fcffa
Commit Graph
24116 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubén DávilaandRobert Speicher 169070ba4b Some updates from last code review. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 6908663479 Refactor RevertService. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d958d027dc Make #commit_with_hooks return the new obj id plus some other fixes. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d34733efc4 Don't show revert button if commit/MR has already been reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher e8d15f1339 Refactor revert_commit_link helper. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher a07021fa8e Make more robust the test to see if a commit has been previously reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher be54ba33ed Refactor commit message for revert commit. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 02f48053f1 No longer need to ignore temporary branch. 
* Now it's only created when user choose to create a MR and
  logic to hide it is handled by https://gitlab.com/gitlab-org/gitlab-ce/blob/50595af7b0e304f16e2955109abd2d25cd96efda/app/helpers/application_helper.rb#L139
 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher f088caca3b Use a reference to the MR when reverting MRs. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 5ad78cdbda Use a custom title in the revert modal. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher b8295fc323 Fix build and add specs 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher ccd2a8d6b5 Show a tooltip on revert link. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 477ae66b4d Move revert link to the MR widget section plus some refactor. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 2ea5b37f2e Some fixes and refactors for code related to forks. 2016-02-19 13:14:53 -05:00
Rubén DávilaandRobert Speicher 11345866d8 Don't make Repository#revert aware of MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 328b52d58a Some updates after last code review. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 38e708f0ce Add link to fork if user can't revert MR. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 9d4c105ab0 Remove code introduced when endpoint was in MR controller. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher a28eef1d1a Update copy and URLs used when reverting MRs. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 38752d159d Remove no longer required methods on MR. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 1469b72c46 Check that target_branch is present. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher e22cdb40ec Big refactor for #revert_commit. 
* Now checking if a commit is already reverted or there is a conflict is
  much more faster.
* No longer need to create a new branch.
 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 4dc8350517 Reuser revert commit modal in MR detail page. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher ef591b87d1 Fix commit message plus other little fix. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b0693318c3 Show list of branches plus some fixes. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 6b0e478353 Some fixes required for conflicts on revert. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 91e6e32d13 Make it work for merge commits. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher b36319a17c Make MRs with revert commit work. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 8061399368 Add RevertService class with basic logic to revert commit 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 34e26b8212 Add button to revert commit on Commit detail page. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 006089f972 Add new endpoint and button to revert any commit. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher b6fe51b901 Some updates from last code review. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 1708e1fc03 Create branch if it doesn't exists. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher df5f362c34 Add some specs plus some refactor. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher b5935f0782 Remove no longer required method. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher ae46d6ea04 Explain why MR can't be reverted. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 5bb5019e04 Use adequate description for new MR. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 0b7d70a35e Use #iid for revert branch name so it's consistent when the MR id in the URL. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher e1a3c8cd1a Don't show last event message on top when reverse branch was created under the hood. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher f4ff2ba57b Check target branch exists before creating revert MR. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 207522f923 Some refactor to the revert commit creation. 
* Not required to run hooks since it's an internal commit
 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher f56ee9d3b9 Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 720e52d9d9 Add merge_commit_sha column to merge_requests. 2016-02-19 13:14:48 -05:00
Rubén DávilaandRobert Speicher d7511a4b04 Create reverse branch and generate MR with new branch. #3409 2016-02-19 13:14:48 -05:00
Rubén DávilaandRobert Speicher d3c2437328 Add new endpoint and button to revert merge. #3409 2016-02-19 13:14:48 -05:00
Grzegorz Bizon 96158aa6b3 Merge branch 'ci/remove-builds' into 'master' 
Make it possible to erase build content (artifacts, trace)

This feature makes it possible to remove build content - build artifacts and build traces.

- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge

Closes #3421

See merge request !2560
 2016-02-19 17:04:07 +00:00
Rémy Coutable 0a71920f65 Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master' 
Mention project name in fork notice

_Originally opened at !1186 by @axil._

- - -

I missed this one in !1070

See merge request !2897
 2016-02-19 16:35:53 +00:00
Grzegorz Bizon 73c9d80bdc Record user that erased a build through API 2016-02-19 17:24:59 +01:00
Grzegorz Bizon fb62196f43 Remove doubled entry from Changelog introduced by merge 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 36971a5046 Fix feature tests for erasing build 2016-02-19 17:24:59 +01:00