Merge branch 'gitignore-.rspec' into 'master'

Allow developers to have custom rspec output settings See merge request !12553

Merge branch 'gitignore-.rspec' into 'master'
Allow developers to have custom rspec output settings See merge request !12553
acb748a6 · Robert Speicher · ef8147f3 · adc00877 · acb748a6 · ef8147f3
Commit acb748a6 authored Jul 05, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

.gitignore .gitignore +1 -0

.rspec .rspec +0 -2

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ eslint-report.html
 /.gitlab_workhorse_secret
 /webpack-report/
 /locale/**/LC_MESSAGES
+/.rspec
--- a/.rspec
+++ b/.rspec
--color
--format Fuubar