Permalink
Browse files

Merge pull request #10 from marekswiecznik/patch-1

ReSetting::ARTIFACT_TYPES clone
  • Loading branch information...
tmerten committed Feb 1, 2016
2 parents 1ab9c6c + c5037f5 commit 140870598a06d208dacdfb43904ee2f674678bde
Showing with 3 additions and 3 deletions.
  1. +2 −2 app/controllers/re_settings_controller.rb
  2. +1 −1 assets/stylesheets/icons.css
@@ -103,7 +103,7 @@ def initialize_artifact_order(project_id)
# Put it into the empty configured_artifact_types array
configured_artifact_types.concat(stored_settings) if stored_settings
all_artifact_types = ReSetting::ARTIFACT_TYPES
all_artifact_types = ReSetting::ARTIFACT_TYPES.clone
all_artifact_types.delete_if { |v| configured_artifact_types.include? v }
configured_artifact_types.concat(all_artifact_types)
@@ -210,4 +210,4 @@ def save_user_config
end
end
end
@@ -7,7 +7,7 @@ a.icon {
background-repeat: no-repeat !important;
}
.project {
.re_project {
background: url(../images/icons/group_gear.png);
}

0 comments on commit 1408705

Please sign in to comment.