javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(CI): v2 -> master

Browse Source
This commit is contained in:
perry
2016-06-24 12:15:58 -05:00
parent a117fd579d
commit 4479a019a7
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@ -804,7 +804,7 @@ gulp.task('git-pull-latest', function() {
} }
//Pull latest //Pull latest
var gitPullResult = spawnSync('git', ['pull', 'origin', '2.0']); var gitPullResult = spawnSync('git', ['pull', 'origin', 'master']);
if (gitPullResult.status !== 0) { if (gitPullResult.status !== 0) {
fail('There was an error running \'git pull\':\n' + gitPullResult.stderr.toString()); 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({ github.releases.createRelease({
owner: 'driftyco', owner: 'driftyco',
repo: 'ionic', repo: 'ionic',
target_commitish: '2.0', target_commitish: 'master',
tag_name: 'v' + packageJSON.version, tag_name: 'v' + packageJSON.version,
name: packageJSON.version, name: packageJSON.version,
body: file.toString(), body: file.toString(),

2
scripts/README.md
View File

@ -66,7 +66,7 @@ To remove the linked version of `ionic-angular` do `npm rm ionic-angular`, and t
### Running Sass Linter ### 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 # Releasing

4
scripts/docs/templates/common.template.html vendored
View File

@ -53,7 +53,7 @@ angular_controller: APIDemoCtrl <@ endif @>
<@- endmacro -@> <@- endmacro -@>
<@ macro githubViewLink(doc) -@> <@ 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 -@> <@- endmacro -@>
<@ macro paramTable(params, isDirective) -@> <@ macro paramTable(params, isDirective) -@>
@ -179,7 +179,7 @@ Delegate: <$ doc.delegate $>
</h1> </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 Improve this doc
</a> </a>

2
scripts/npm/package.json
View File

@ -8,7 +8,7 @@
"jsnext:main": "esm/index.js", "jsnext:main": "esm/index.js",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/driftyco/ionic.git#2.0`" "url": "https://github.com/driftyco/ionic.git"
}, },
"dependencies": { "dependencies": {
"colors": "^1.1.2", "colors": "^1.1.2",