diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-14 14:04:08 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-14 14:04:08 +0200 |
| commit | f31d8ef2875c05ef2e254b637889b804990633c5 (patch) | |
| tree | a1dc89f111c5d7cb53d50953d307b1d0b312eaca /lib/api | |
| parent | 1ce85dc4e2a1b162a0c30349f3594c1aab710708 (diff) | |
| parent | 4c53cc0ebac36560d806732ff1fefba9206c75f3 (diff) | |
| download | gitlab-ce-f31d8ef2875c05ef2e254b637889b804990633c5.tar.gz | |
Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
* commit '4c53cc0ebac36560d806732ff1fefba9206c75f3':
rubocop satisfy
Conflicts:
app/controllers/ci/builds_controller.rb
app/controllers/ci/commits_controller.rb
Diffstat (limited to 'lib/api')
0 files changed, 0 insertions, 0 deletions