Commit Graph

6 Commits

Author SHA1 Message Date
GitLab Bot 25521def84 Add latest changes from gitlab-org/gitlab@master 2019-10-03 18:06:11 +00:00
Robert Speicher 24fc237710
Fix LineBreakAroundConditionalBlock cop for a conditional after rescue
Previously this would violate on the `if`:

    def a_method
      do_something
    rescue
      if condition
        do_something
      end
    end
2018-09-05 09:34:11 -07:00
Bob Van Landuyt 08c0a1b852 Reject ruby interpolation in externalized strings
When using ruby interpolation in externalized strings, they can't be
detected. Which means they will never be presented to be translated.

To mix variables into translations we need to use `sprintf`
instead.

Instead of:

    _("Hello #{subject}")

Use:

    _("Hello %{subject}) % { subject: 'world' }
2018-08-25 18:43:21 +02:00
Lin Jen-Shin 612f5e63b3 Update rubocop to get rid of a warning in other MR 2018-07-09 21:12:31 +08:00
Rémy Coutable 1c5106fadf
Allow comment after if/unless clause
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-29 10:38:59 +02:00
🙈 jacopo beschi 🙉 729f05f0e3 Adds Rubocop rule for line break around conditionals 2018-01-11 16:34:01 +00:00