Merge branch 'master' of https://github.com/IdeaBlade/angular.io

Author: kapunahelewong

.travis.yml

@@ -10,7 +10,7 @@ env:
     - DBUS_SESSION_BUS_ADDRESS=/dev/null
     - DISPLAY=:99.0
     - CHROME_BIN=chromium-browser
-    - LATEST_RELEASE=2.0.0-rc.5
+    - LATEST_RELEASE=2.0.0-rc.6
     - TASK_FLAGS="--dgeni-log=warn"
   matrix:
     - TASK=lint

package.json

@@ -42,13 +42,13 @@
     "globby": "^4.0.0",
     "gulp": "^3.5.6",
     "gulp-env": "0.4.0",
-    "gulp-sass": "^2.3.2",
     "gulp-less": "^3.1.0",
+    "gulp-sass": "^2.3.2",
     "gulp-task-listing": "^1.0.1",
     "gulp-tslint": "^5.0.0",
     "gulp-util": "^3.0.6",
     "gulp-watch": "^4.3.4",
-    "harp": "0.21.0-pre.0",
+    "harp": "git://github.com/filipesilva/harp.git#8da8d3497ddbfcbcbadd8be63e0fd731d7310cc4",
     "html2jade": "^0.8.4",
     "indent-string": "^2.1.0",
     "jasmine-core": "^2.3.4",

public/_includes/_hero-home.jade

@@ -8,6 +8,6 @@ header(class="background-sky")
   .banner.banner-floaty
     .banner-ng-annoucement
       div(class="banner-text" align="center")
-        p Join us for AngularConnect in London, UK this September!
+        p Join us for ng-europe in Paris, France this October!
       div(class="banner-button")
-        a(href="http://angularconnect.com/?utm_source=angular&utm_medium=banner&utm_campaign=angular-banner" target="_blank" class="button md-button") Register now
+        a(href="https://ngeurope.org/?utm_source=angular&utm_medium=banner&utm_campaign=angular-banner" target="_blank" class="button md-button") Register now

scripts/config/bad-code-excerpt-skip-patterns.txt

@@ -4,3 +4,4 @@
 /[jt]s/.*/api/router-deprecated/    # Obsolete API entries. No issue open yet.
 /ts/latest/guide/style-guide.html   # https://github.com/angular/angular.io/issues/2123
 /ts/latest/guide/upgrade.html       # In a transient state until RC6 - @filipe.silva
+/[jt]s/.*/api/forms/index/NG_VALIDATORS-let.html    # RC6 contains broken example tags

tools/api-builder/angular.io-package/index.js

@@ -15,7 +15,6 @@ module.exports = new Package('angular.io', [basePackage, targetPackage, cheatshe
 
 .factory(require('./services/renderMarkdown'))
 .processor(require('./processors/addJadeDataDocsProcessor'))
-.processor(require('./processors/filterUnwantedDecorators'))
 .processor(require('./processors/matchUpDirectiveDecorators'))
 .processor(require('./processors/filterMemberDocs'))
 
@@ -47,20 +46,13 @@ module.exports = new Package('angular.io', [basePackage, targetPackage, cheatshe
   }
   readTypeScriptModules.basePath = path.resolve(angular_repo_path, 'modules');
   readTypeScriptModules.ignoreExportsMatching = [
-    '___esModule',
-    '___core_private_types__',
-    '___platform_browser_private__',
-    '___platform_browser_private_types__',
-    '___platform_browser_dynamic_private__',
-    '___platform_browser_dynamic_private_types__',
-    '___platform_server_private__',
-    '___router_private__' ,
-    '___core_private_testing_types__',
-    '___compiler_private__',
+    '__esModule',
     '__core_private__',
-    '___core_private__',
-    '___core_private_testing_placeholder__',
-    '___core_private_testing__'
+    '__core_private_testing__',
+    '__platform_browser_private__',
+    '__platform_browser_dynamic_private__',
+    '__platform_server_private__',
+    '__router_private__',
   ];
 
   readTypeScriptModules.sourceFiles = [
@@ -81,7 +73,6 @@ module.exports = new Package('angular.io', [basePackage, targetPackage, cheatshe
     '@angular/platform-webworker-dynamic/index.ts',
     '@angular/router/index.ts',
     '@angular/router/testing/index.ts',
-    '@angular/router-deprecated/index.ts',
     '@angular/upgrade/index.ts',
   ];
   readTypeScriptModules.hidePrivateMembers = true;
@@ -167,12 +158,4 @@ module.exports = new Package('angular.io', [basePackage, targetPackage, cheatshe
     require('./rendering/toId'),
     require('./rendering/indentForMarkdown')
   ]));
-})
-
-.config(function(filterUnwantedDecorators) {
-  filterUnwantedDecorators.decoratorsToIgnore = [
-    'CONST',
-    'IMPLEMENTS',
-    'ABSTRACT'
-  ];
 });

tools/api-builder/angular.io-package/processors/filterUnwantedDecorators.js

@@ -22,7 +22,7 @@
     {% if doc.statics.length %}
     div(layout="column")
       {% for member in doc.statics %}{% if not member.internal %}
-        pre(class="prettyprint no-bg-with-indent")
+        pre(class="prettyprint no-bg-with-indent") static
           a(class="code-anchor" href="#{$ member.name $}-anchor")
             code(class="code-background api-doc-code") {$ member.name | indent(6, false) | trim $}
           code(class="api-doc-code") {$ params.paramList(member.parameters) | indent(8, false) | trim $}{$ params.returnType(member.returnType) $}