diff --git a/gulpfile.js b/gulpfile.js index 61750616540..7c0e0a6c155 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -804,7 +804,7 @@ gulp.task('git-pull-latest', function() { } //Pull latest - var gitPullResult = spawnSync('git', ['pull', 'origin', '2.0']); + var gitPullResult = spawnSync('git', ['pull', 'origin', 'master']); if (gitPullResult.status !== 0) { fail('There was an error running \'git pull\':\n' + gitPullResult.stderr.toString()); } @@ -858,7 +858,7 @@ gulp.task('publish.github', function(done){ github.releases.createRelease({ owner: 'driftyco', repo: 'ionic', - target_commitish: '2.0', + target_commitish: 'master', tag_name: 'v' + packageJSON.version, name: packageJSON.version, body: file.toString(), diff --git a/scripts/README.md b/scripts/README.md index 78a46dc7ee4..e3876ae5686 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -66,7 +66,7 @@ To remove the linked version of `ionic-angular` do `npm rm ionic-angular`, and t ### Running Sass Linter -1. See the [Sass Guidelines](https://github.com/driftyco/ionic/blob/2.0/CONTRIBUTING.md#sass-guidelines) for editing Sass and running the linter. +1. See the [Sass Guidelines](https://github.com/driftyco/ionic/blob/master/CONTRIBUTING.md#sass-guidelines) for editing Sass and running the linter. # Releasing diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html index d986312b9c9..9499932d1f7 100644 --- a/scripts/docs/templates/common.template.html +++ b/scripts/docs/templates/common.template.html @@ -53,7 +53,7 @@ <@- endmacro -@> <@ macro githubViewLink(doc) -@> - <$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>) + <$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>) <@- endmacro -@> <@ macro paramTable(params, isDirective) -@> @@ -179,7 +179,7 @@

<$ doc.directiveInfo.properties[0].values $>

- + Improve this doc diff --git a/scripts/npm/package.json b/scripts/npm/package.json index adbfeafe807..b1f0e7fd3a6 100644 --- a/scripts/npm/package.json +++ b/scripts/npm/package.json @@ -8,7 +8,7 @@ "jsnext:main": "esm/index.js", "repository": { "type": "git", - "url": "https://github.com/driftyco/ionic.git#2.0`" + "url": "https://github.com/driftyco/ionic.git" }, "dependencies": { "colors": "^1.1.2",