diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-06-20 19:17:59 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-06-20 19:17:59 +0000 |
| commit | a7f116ca65a2645b2e01f00018b6baad221cea4f (patch) | |
| tree | de4302ae504b22175e530bc4488564e33da21cc6 | |
| parent | a8f4f48e4ad0283e4542b36b10a3edebf1e700a0 (diff) | |
| parent | 582c6b17cf93f6c83bad215301ef6480a4f4748b (diff) | |
| download | gitlab-ce-a7f116ca65a2645b2e01f00018b6baad221cea4f.tar.gz | |
Merge branch 'unify-lib-tasks' into 'master'
Unify flay.rake and gettext.rake from EE
See merge request gitlab-org/gitlab-ce!20041
| -rw-r--r-- | lib/tasks/flay.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/gettext.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/flay.rake b/lib/tasks/flay.rake index 4b4881cecb8..4bec013a141 100644 --- a/lib/tasks/flay.rake +++ b/lib/tasks/flay.rake @@ -1,6 +1,6 @@ desc 'Code duplication analyze via flay' task :flay do - output = `bundle exec flay --mass 35 app/ lib/gitlab/ 2> #{File::NULL}` + output = `bundle exec flay --mass 35 app/ lib/gitlab/ ee/ 2> #{File::NULL}` if output.include?("Similar code found") || output.include?("IDENTICAL code found") puts output diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake index d7c40cb6a12..d8ff2aa824d 100644 --- a/lib/tasks/gettext.rake +++ b/lib/tasks/gettext.rake @@ -4,7 +4,7 @@ namespace :gettext do # Customize list of translatable files # See: https://github.com/grosser/gettext_i18n_rails#customizing-list-of-translatable-files def files_to_translate - folders = %W(app lib config #{locale_path}).join(',') + folders = %W(ee app lib config #{locale_path}).join(',') exts = %w(rb erb haml slim rhtml js jsx vue handlebars hbs mustache).join(',') Dir.glob( |