| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | Make more robust the test to see if a commit has been previously reverted. | Rubén Dávila | 2016-02-19 | 1 | -5/+5 | |
| | | | | | | | | ||||||
| | * | | | | | | Refactor commit message for revert commit. | Rubén Dávila | 2016-02-19 | 1 | -3/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | No longer need to ignore temporary branch. | Rubén Dávila | 2016-02-19 | 2 | -3/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | |||||
| | * | | | | | | Use a reference to the MR when reverting MRs. | Rubén Dávila | 2016-02-19 | 1 | -1/+7 | |
| | | | | | | | | ||||||
| | * | | | | | | Use a custom title in the revert modal. | Rubén Dávila | 2016-02-19 | 3 | -3/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | Fix build and add specs | Rubén Dávila | 2016-02-19 | 5 | -19/+16 | |
| | | | | | | | | ||||||
| | * | | | | | | Show a tooltip on revert link. | Rubén Dávila | 2016-02-19 | 2 | -8/+6 | |
| | | | | | | | | ||||||
| | * | | | | | | Move revert link to the MR widget section plus some refactor. | Rubén Dávila | 2016-02-19 | 3 | -5/+4 | |
| | | | | | | | | ||||||
| | * | | | | | | Some fixes and refactors for code related to forks. | Rubén Dávila | 2016-02-19 | 3 | -6/+27 | |
| | | | | | | | | ||||||
| | * | | | | | | Don't make Repository#revert aware of MRs. | Rubén Dávila | 2016-02-19 | 2 | -5/+9 | |
| | | | | | | | | ||||||
| | * | | | | | | Some updates after last code review. | Rubén Dávila | 2016-02-19 | 9 | -52/+67 | |
| | | | | | | | | ||||||
| | * | | | | | | Add link to fork if user can't revert MR. | Rubén Dávila | 2016-02-19 | 5 | -3/+23 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove code introduced when endpoint was in MR controller. | Rubén Dávila | 2016-02-19 | 1 | -2/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Update copy and URLs used when reverting MRs. | Rubén Dávila | 2016-02-19 | 3 | -4/+30 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove no longer required methods on MR. | Rubén Dávila | 2016-02-19 | 1 | -12/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | Check that target_branch is present. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Big refactor for #revert_commit. | Rubén Dávila | 2016-02-19 | 2 | -39/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | |||||
| | * | | | | | | Reuser revert commit modal in MR detail page. | Rubén Dávila | 2016-02-19 | 6 | -25/+14 | |
| | | | | | | | | ||||||
| | * | | | | | | Fix commit message plus other little fix. | Rubén Dávila | 2016-02-19 | 2 | -3/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Show list of branches plus some fixes. | Rubén Dávila | 2016-02-19 | 2 | -9/+7 | |
| | | | | | | | | ||||||
| | * | | | | | | Some fixes required for conflicts on revert. | Rubén Dávila | 2016-02-19 | 2 | -9/+14 | |
| | | | | | | | | ||||||
| | * | | | | | | Make it work for merge commits. | Rubén Dávila | 2016-02-19 | 3 | -10/+15 | |
| | | | | | | | | ||||||
| | * | | | | | | Make MRs with revert commit work. | Rubén Dávila | 2016-02-19 | 4 | -17/+37 | |
| | | | | | | | | ||||||
| | * | | | | | | Add RevertService class with basic logic to revert commit | Rubén Dávila | 2016-02-19 | 4 | -12/+100 | |
| | | | | | | | | ||||||
| | * | | | | | | Add button to revert commit on Commit detail page. | Rubén Dávila | 2016-02-19 | 4 | -2/+27 | |
| | | | | | | | | ||||||
| | * | | | | | | Add new endpoint and button to revert any commit. | Rubén Dávila | 2016-02-19 | 2 | -0/+33 | |
| | | | | | | | | ||||||
| | * | | | | | | Some updates from last code review. | Rubén Dávila | 2016-02-19 | 5 | -28/+30 | |
| | | | | | | | | ||||||
| | * | | | | | | Create branch if it doesn't exists. | Rubén Dávila | 2016-02-19 | 1 | -3/+4 | |
| | | | | | | | | ||||||
| | * | | | | | | Add some specs plus some refactor. | Rubén Dávila | 2016-02-19 | 3 | -10/+17 | |
| | | | | | | | | ||||||
| | * | | | | | | Remove no longer required method. | Rubén Dávila | 2016-02-19 | 1 | -4/+0 | |
| | | | | | | | | ||||||
| | * | | | | | | Explain why MR can't be reverted. | Rubén Dávila | 2016-02-19 | 1 | -8/+8 | |
| | | | | | | | | ||||||
| | * | | | | | | Use adequate description for new MR. | Rubén Dávila | 2016-02-19 | 2 | -2/+3 | |
| | | | | | | | | ||||||
| | * | | | | | | Use #iid for revert branch name so it's consistent when the MR id in the URL. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Don't show last event message on top when reverse branch was created under ↵ | Rubén Dávila | 2016-02-19 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the hood. | |||||
| | * | | | | | | Check target branch exists before creating revert MR. | Rubén Dávila | 2016-02-19 | 1 | -0/+5 | |
| | | | | | | | | ||||||
| | * | | | | | | Some refactor to the revert commit creation. | Rubén Dávila | 2016-02-19 | 3 | -17/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Not required to run hooks since it's an internal commit | |||||
| | * | | | | | | Save merge commit id when MR is merged | Rubén Dávila | 2016-02-19 | 3 | -5/+30 | |
| | | | | | | | | ||||||
| | * | | | | | | Add merge_commit_sha column to merge_requests. | Rubén Dávila | 2016-02-19 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Create reverse branch and generate MR with new branch. #3409 | Rubén Dávila | 2016-02-19 | 3 | -2/+20 | |
| | | | | | | | | ||||||
| | * | | | | | | Add new endpoint and button to revert merge. #3409 | Rubén Dávila | 2016-02-19 | 2 | -1/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master' | Rémy Coutable | 2016-02-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistency in MR and issue header. Fixes: #13550  See merge request !2874 | |||||
| | * | | | | | | Consistency in MR and issue header.bugfix/jschatz1/issuable-consistency | Jacob Schatz | 2016-02-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'ci/remove-builds' into 'master' | Grzegorz Bizon | 2016-02-19 | 3 | -27/+92 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | Use POST method instead of DELETE when erasing a build | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042 | |||||
| | * | | | | | | | Improve build view for erased build details | Grzegorz Bizon | 2016-02-19 | 1 | -2/+6 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Move build erasable implementation from concern to model | Grzegorz Bizon | 2016-02-19 | 3 | -41/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3659905 | |||||
| | * | | | | | | | Use button groups in build summary for consistency | Grzegorz Bizon | 2016-02-19 | 1 | -12/+13 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fix name of build erasable, remove superfluous method from it | Grzegorz Bizon | 2016-02-19 | 3 | -18/+13 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Fix date in alert saying that build has been erased | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Use DELETE verb for erasing a build content | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added API specs for that | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |