aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2014-03-18 15:22:28 +0100
committerSimon Brandhof <simon.brandhof@gmail.com>2014-03-18 15:37:59 +0100
commit152cf9835b1cfd4a817b83ec48e2b1f474e8490f (patch)
treecd4feca1e750aa35b249b965158c9389f87dbec8 /sonar-server
parentd8615a4edd4f958109de1b8dcd3caebb8958a55e (diff)
downloadsonarqube-152cf9835b1cfd4a817b83ec48e2b1f474e8490f.tar.gz
sonarqube-152cf9835b1cfd4a817b83ec48e2b1f474e8490f.zip
SONAR-5143 revert. Inclusions are coming back to UI !
Conflicts: sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql sonar-server/src/main/webapp/WEB-INF/db/migrate/499_delete_inclusions_properties.rb
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/db/migrate/499_delete_inclusions_properties.rb35
1 files changed, 0 insertions, 35 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/499_delete_inclusions_properties.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/499_delete_inclusions_properties.rb
deleted file mode 100644
index 84a8bfb9899..00000000000
--- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/499_delete_inclusions_properties.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# SonarQube, open source software quality management tool.
-# Copyright (C) 2008-2013 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# SonarQube is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# SonarQube is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-
-#
-# SonarQube 4.2
-# SONAR-5143
-#
-class DeleteInclusionsProperties < ActiveRecord::Migration
-
- class Property < ActiveRecord::Base
- end
-
- def self.up
- Property.delete_all("prop_key = 'sonar.inclusions'")
- Property.delete_all("prop_key = 'sonar.test.inclusions'")
- end
-
-end