diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-02 21:59:28 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-02 21:59:28 -0800 |
| commit | 61cc6a9244f316f684cd887febd9dae1030a04b0 (patch) | |
| tree | 96e9335bf6348a0ac3375dbab6fe39bbe9e6d3e7 /lib | |
| parent | d04344373b899c1e54948ca46478f7b907a576d2 (diff) | |
| download | gitlab-ce-61cc6a9244f316f684cd887febd9dae1030a04b0.tar.gz | |
Rubocop: indentation fixes Yay!!!
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/parser.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/git_access.rb | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb index 0242e09a515..887ed76b36c 100644 --- a/lib/gitlab/diff/parser.rb +++ b/lib/gitlab/diff/parser.rb @@ -74,7 +74,7 @@ module Gitlab def html_escape(str) replacements = { '&' => '&', '>' => '>', '<' => '<', '"' => '"', "'" => ''' } - str.gsub(/[&"'><]/, replacements) + str.gsub(/[&"'><]/, replacements) end end end diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index 0530923b202..6444cec7eb5 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -112,14 +112,14 @@ module Gitlab def protected_branch_action(project, oldrev, newrev, branch_name) # we dont allow force push to protected branch if forced_push?(project, oldrev, newrev) - :force_push_code_to_protected_branches + :force_push_code_to_protected_branches elsif newrev == Gitlab::Git::BLANK_SHA - # and we dont allow remove of protected branch - :remove_protected_branches + # and we dont allow remove of protected branch + :remove_protected_branches elsif project.developers_can_push_to_protected_branch?(branch_name) - :push_code + :push_code else - :push_code_to_protected_branches + :push_code_to_protected_branches end end |