summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-06-01 16:39:27 +0900
committerShinya Maeda <shinya@gitlab.com>2017-07-06 16:33:08 +0900
commitaddf0a5bbaf8096cd26600e63b0cb984bac9c52b (patch)
tree86818f6ed2645d23594c640d0f3e7a1db7631ba8
parent7a5a6b830966d1dccc832df07a45f2d3d3184c40 (diff)
downloadgitlab-ce-addf0a5bbaf8096cd26600e63b0cb984bac9c52b.tar.gz
Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable
Rename the rest of them Add the rest of files
-rw-r--r--app/models/ci/variable_group.rb9
-rw-r--r--app/models/ci/variable_project.rb9
-rw-r--r--spec/models/ci/variable_group_spec.rb7
-rw-r--r--spec/models/ci/variable_project_spec.rb7
4 files changed, 0 insertions, 32 deletions
diff --git a/app/models/ci/variable_group.rb b/app/models/ci/variable_group.rb
deleted file mode 100644
index 3abdb8d9cd5..00000000000
--- a/app/models/ci/variable_group.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Ci
- class VariableGroup < Ci::Variable
- self.table_name = 'ci_group_variables'
-
- belongs_to :group
-
- validates :key, uniqueness: { scope: :group_id }
- end
-end
diff --git a/app/models/ci/variable_project.rb b/app/models/ci/variable_project.rb
deleted file mode 100644
index 6d68aab8c7d..00000000000
--- a/app/models/ci/variable_project.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Ci
- class VariableProject < Ci::Variable
- self.table_name = 'ci_variables'
-
- belongs_to :project
-
- validates :key, uniqueness: { scope: :project_id }
- end
-end
diff --git a/spec/models/ci/variable_group_spec.rb b/spec/models/ci/variable_group_spec.rb
deleted file mode 100644
index a1e4bd4a7f2..00000000000
--- a/spec/models/ci/variable_group_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe Ci::VariableGroup, models: true do
- subject { build(:ci_variable_group) }
-
- it { is_expected.to validate_uniqueness_of(:key).scoped_to(:group_id) }
-end
diff --git a/spec/models/ci/variable_project_spec.rb b/spec/models/ci/variable_project_spec.rb
deleted file mode 100644
index 9325f584388..00000000000
--- a/spec/models/ci/variable_project_spec.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe Ci::VariableProject, models: true do
- subject { build(:ci_variable_project) }
-
- it { is_expected.to validate_uniqueness_of(:key).scoped_to(:project_id) }
-end