diff options
| author | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 16:00:25 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz.bizon@ntsn.pl> | 2015-12-14 16:00:25 +0300 |
| commit | 76a17d4f5440184fb9809fef3d57c98f2642ea09 (patch) | |
| tree | f229a3e47522c5befac9ea4f81b953d6fa64791e /spec/features | |
| parent | 2ec93abed7a1a3aa49b3267342824e0743de0f54 (diff) | |
| parent | 73ba411af9f4552e72230d2b9852399e66a23260 (diff) | |
Merge branch 'master' into ci/persist-registration-token
* master:
Move CI admin builds and runners specs to correct directory
Fix 500 when viewing specific runners on runners page
Fix Ci::Project migration not migrating columns that cannot be NULL
Fix MySQL migration of CI emails
Minor fix in flow 'Merge when build succeeds'
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/admin/admin_builds_spec.rb (renamed from spec/features/atom/builds_spec.rb) | 0 | ||||
| -rw-r--r-- | spec/features/admin/admin_runners_spec.rb (renamed from spec/features/atom/runners_spec.rb) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/spec/features/atom/builds_spec.rb b/spec/features/admin/admin_builds_spec.rb index 72764b1629d..72764b1629d 100644 --- a/spec/features/atom/builds_spec.rb +++ b/spec/features/admin/admin_builds_spec.rb diff --git a/spec/features/atom/runners_spec.rb b/spec/features/admin/admin_runners_spec.rb index d5dd11a01d3..d5dd11a01d3 100644 --- a/spec/features/atom/runners_spec.rb +++ b/spec/features/admin/admin_runners_spec.rb |