Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js |
||
|---|---|---|
| .. | ||
| file_spec.js | ||
| merge_request_spec.js | ||
| project_spec.js | ||
| tree_spec.js | ||
Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js |
||
|---|---|---|
| .. | ||
| file_spec.js | ||
| merge_request_spec.js | ||
| project_spec.js | ||
| tree_spec.js | ||