Merge branch 'dev'

Conflicts:
	dist.ini

Author: jbarrett

Gruntfile.js

@@ -209,7 +209,8 @@ module.exports = function(grunt) {
          * revert the version number in package.json
          */
         exec: {
-            revert: "./script/revert_pkg_version.pl"
+            revert: "./script/revert_pkg_version.pl",
+            revert_release: "./script/revert_pkg_version.pl release"
         },
 
         /*
@@ -255,6 +256,8 @@ module.exports = function(grunt) {
 
         grunt.registerTask('revert', ['exec:revert']);
 
+        grunt.registerTask('revert-release', ['exec:revert_release']);
+        
         // add modules here
         grunt.loadNpmTasks('grunt-contrib-concat');
         grunt.loadNpmTasks('grunt-contrib-handlebars');

dist.ini

@@ -34,8 +34,7 @@ exclude_filename=script/ddgc_release.sh
 [ExecDir]
 [ShareDir]
 [MakeMaker]
-;[MakeMaker::SkipInstall]
-[EOLTests]
+[Test::EOL]
 trailing_whitespace = 0
 [Manifest]
 [TestRelease]
@@ -54,8 +53,9 @@ directory = inc/
 version_regexp = ^(.+)$
 [PkgVersion]
 [PodSyntaxTests]
-;[GithubMeta]
 [Repository]
+homepage = https://duck.co/
+issues = 1
 
 [Git::ExcludeUntracked]
 

lib/DDGC/Web/Controller/InstantAnswer.pm

@@ -31,13 +31,14 @@ sub index :Chained('base') :PathPart('') :Args() {
     my $rs = $c->d->rs('Topic');
 
     my @topics = $rs->search(
-        {},
+        {'name' => { '!=' => 'test' }},
         {
             columns => [ qw/ name id /],
             result_class => 'DBIx::Class::ResultClass::HashRefInflator',
         }
     )->all;
 
+    $c->stash->{title} = "Index: Instant Answers";
     $c->stash->{topic_list} = \@topics;
     $c->add_bc('Instant Answers', $c->chained_uri('InstantAnswer','index'));
 
@@ -56,7 +57,7 @@ sub ialist_json :Chained('base') :PathPart('json') :Args() {
     }
 
     my @ial = $rs->search(
-        {},
+        {'topic.name' => { '!=' => 'test' }},
         {
             columns => [ qw/ name id repo src_name dev_milestone description template / ],
             prefetch => { instant_answer_topics => 'topic' },
@@ -142,9 +143,19 @@ sub ia_base :Chained('base') :PathPart('view') :CaptureArgs(1) {  # /ia/view/cal
         }
     }
 
+    $c->stash->{title} = $c->stash->{ia}->name;
     $c->stash->{edit_class} = $edit_class;
     $c->stash->{commit_class} = $commit_class;
 
+    my @topics = $c->d->rs('Topic')->search(
+        {'name' => { '!=' => 'test' }},
+        {
+            columns => [ qw/ name id /],
+            result_class => 'DBIx::Class::ResultClass::HashRefInflator',
+        }
+    )->all;
+
+    $c->stash->{topic_list} = \@topics;
     $c->add_bc('Instant Answers', $c->chained_uri('InstantAnswer','index'));
     $c->add_bc($c->stash->{ia}->name);
 }
@@ -153,19 +164,10 @@ sub ia_json :Chained('ia_base') :PathPart('json') :Args(0) {
     my ( $self, $c) = @_;
 
     my $ia = $c->stash->{ia};
-    my @topics_list =  $c->d->rs('Topic')->all();
     my @topics = map { $_->name} $ia->topics;
-    my @allowed;
 
     my @issues = $c->d->rs('InstantAnswer::Issues')->find({instant_answer_id => $ia->id});
-    my @ia_issues;    
- 
-    for my $topic (@topics_list) {
-        push (@allowed, {
-               id => $topic->id,
-               name => $topic->name
-            });
-    }
+    my @ia_issues; 
 
     for my $issue (@issues) {
         if ($issue) {
@@ -192,7 +194,6 @@ sub ia_json :Chained('ia_base') :PathPart('json') :Args(0) {
                 code => $ia->code? decode_json($ia->code) : undef,
                 topic => \@topics,
                 attribution => $ia->attribution? decode_json($ia->attribution) : undef,
-                allowed_topics => \@allowed,
                 issues => \@ia_issues,
                 template => $ia->template,
     };

lib/DDGC/Web/Controller/Root.pm

@@ -77,7 +77,7 @@ sub base :Chained('/') :PathPart('') :CaptureArgs(0) {
 	$c->wiz_check;
 
 	$c->response->header( 'X-Frame-Options' => 'DENY' );
-	$c->response->header( 'Content-Security-Policy' => "default-src 'self' ; img-src 'self' https://*.duckduckgo.com ; script-src 'self' 'unsafe-inline' ; style-src 'self' 'unsafe-inline' ;" );
+	$c->response->header( 'Content-Security-Policy' => "default-src 'self' ; img-src 'self' https://*.duckduckgo.com https://duckduckgo.com ; script-src 'self' 'unsafe-inline' ; style-src 'self' 'unsafe-inline' ;" );
 
 	# Should not be necessary, is not harmful
 	$c->response->header( 'X-Permitted-Cross-Domain-Policies' => 'master-only' );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddg_community_platform",
-  "version": "0.45.0",
+  "version": "0.49.0",
   "engines": {
     "node": ">=0.10.0"
   },