diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-03-11 14:22:49 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-03-11 14:22:49 +0100 |
| commit | 388f69b0de6450ec48a8b88df48bbe2d465593ea (patch) | |
| tree | 605a78c0546f20a86e63afe255a82c86f0148c7f /app/models/snippet.rb | |
| parent | 9a271d80128451eecc9a301d5e9924c09740be07 (diff) | |
| parent | 29ac9f64ea6d0a9e5a7615a9597c668dd129f5ae (diff) | |
| download | gitlab-ce-388f69b0de6450ec48a8b88df48bbe2d465593ea.tar.gz | |
Merge remote-tracking branch 'origin/master' into gitlab-ci-yaml-updates
# Conflicts:
# spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
Diffstat (limited to 'app/models/snippet.rb')
0 files changed, 0 insertions, 0 deletions