Kamil Trzcinski 006b650988 Merge remote-tracking branch 'origin/master' into environments-and-deployments ... # Conflicts: # db/schema.rb		2016-06-14 16:19:29 +02:00
..
ansi2html_spec.rb	Replace \n to <br>	2016-05-23 21:59:07 -05:00
charts_spec.rb	Rename all [ci_]commit to [ci_]pipeline in specs and features	2016-06-03 16:22:26 +02:00
gitlab_ci_yaml_processor_spec.rb	Merge remote-tracking branch 'origin/master' into environments-and-deployments	2016-06-14 16:19:29 +02:00