Commit 37fbb15a authored by James Lopez's avatar James Lopez
Browse files

refactored some stuff and added new models / attributes after rebase

parent d8575963511d
......@@ -11,7 +11,6 @@ issues:
- labels
- todos
- user_agent_detail
- project
- moved_to
- events
events:
......@@ -173,3 +172,4 @@ project:
- triggers
- environments
- deployments
- project_feature
\ No newline at end of file
......@@ -23,7 +23,7 @@
it 'has no new models' do
model_names.each do |model_name|
new_models = current_models[model_name] - all_models[model_name]
new_models = Array(current_models[model_name]) - Array(all_models[model_name])
expect(new_models).to be_empty, failure_message(model_name.classify, new_models)
end
end
......@@ -36,7 +36,7 @@ def setup_models
model_names.each do |model_name|
model_class = relation_class_for_name(model_name)
all_models_hash[model_name] = associations_for(model_class)
all_models_hash[model_name] = associations_for(model_class) - ['project']
end
all_models_hash
......
......@@ -298,3 +298,13 @@ Project:
- archived
Author:
- name
ProjectFeature:
- id
- project_id
- merge_requests_access_level
- issues_access_level
- wiki_access_level
- snippets_access_level
- builds_access_level
- created_at
- updated_at
\ No newline at end of file
......@@ -23,9 +23,7 @@ def parsed_attributes(relation_name, attributes)
attributes
end
def associations_for(model_class)
model_class.reflect_on_all_associations.map do |association|
association.name.to_s
end
def associations_for(safe_model)
safe_model.reflect_on_all_associations.map { |assoc| assoc.name.to_s }
end
end
......@@ -120,10 +120,6 @@ def is_safe_hash?(parent, sensitive_word)
false
end
def associations_for(safe_model)
safe_model.reflect_on_all_associations.map { |assoc| assoc.name.to_s }
end
# Compares model attributes with those those found in the hash
# and returns true if there is a match, ignoring some excluded attributes.
def safe_model?(model, excluded_attributes, parent)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment