diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-12 18:08:42 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-19 21:14:53 +0300 |
| commit | 02f48053f1328055bef548bf2627e8f71c919a11 (patch) | |
| tree | c6a04cea3fce16b7caf4eee4d9ad8bb4af7b4840 | |
| parent | f088caca3b3f90829735c23d061fd55230d1be3e (diff) | |
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
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/models/commit.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 44a62143cf7..f0aa2b57121 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -135,8 +135,6 @@ module ApplicationHelper # Skip if user removed branch right after that return false unless project.repository.branch_names.include?(event.branch_name) - return false if event.branch_name =~ Gitlab::Git::REVERT_BRANCH_PATTERN - true end diff --git a/app/models/commit.rb b/app/models/commit.rb index 1237c50b759..beae2fe7a1a 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -216,7 +216,7 @@ class Commit end def revert_branch_name - "revert-#{project.id}-#{short_id}" + "revert-#{short_id}" end def revert_message |