Skip to content

Commit

Permalink
chore(CI): v2 -> master
Browse files Browse the repository at this point in the history
  • Loading branch information
perrygovier committed Jun 24, 2016
1 parent a117fd5 commit 4479a01
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions scripts/docs/templates/common.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<@- endmacro -@>

<@ macro githubViewLink(doc) -@>
<a href="https://github.com/<$ versionInfo.gitRepoInfo.owner $>/<$ versionInfo.gitRepoInfo.repo $>/tree/2.0/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
<a href="https://github.com/<$ versionInfo.gitRepoInfo.owner $>/<$ versionInfo.gitRepoInfo.repo $>/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
<@- endmacro -@>

<@ macro paramTable(params, isDirective) -@>
Expand Down Expand Up @@ -179,7 +179,7 @@ <h3><code><$ doc.directiveInfo.properties[0].values $></code></h3>

</h1>

<a class="improve-v2-docs" href="http://github.com/driftyco/ionic/edit/2.0/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
<a class="improve-v2-docs" href="http://github.com/driftyco/ionic/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
Improve this doc
</a>

Expand Down
2 changes: 1 addition & 1 deletion scripts/npm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 4479a01

Please sign in to comment.