Skip to content

Commit c660edf

Browse files
committed
⬆️ v3.5.1...v3.6.1
1 parent fa811da commit c660edf

8 files changed

Lines changed: 1463 additions & 163 deletions

File tree

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/.watchmanconfig
1818
/bower.json
1919
/config/ember-try.js
20+
/CONTRIBUTING.md
2021
/ember-cli-build.js
2122
/testem.js
2223
/tests/

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ env:
2020
# See https://git.io/vdao3 for details.
2121
- JOBS=1
2222

23+
branches:
24+
only:
25+
- master
26+
# npm version tags
27+
- /^v\d+\.\d+\.\d+/
28+
2329
jobs:
2430
fail_fast: true
2531
allow_failures:
@@ -40,6 +46,7 @@ jobs:
4046
- stage: "Additional Tests"
4147
env: EMBER_TRY_SCENARIO=ember-lts-2.16
4248
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
49+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
4350
- env: EMBER_TRY_SCENARIO=ember-release
4451
- env: EMBER_TRY_SCENARIO=ember-beta
4552
- env: EMBER_TRY_SCENARIO=ember-canary

CONTRIBUTING.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone <repository-url>`
6+
* `cd ember-cli-bootstrap3-tooltip`
7+
* `yarn install`
8+
9+
## Linting
10+
11+
* `yarn lint:hbs`
12+
* `yarn lint:js`
13+
* `yarn lint:js --fix`
14+
15+
## Running tests
16+
17+
* `ember test` – Runs the test suite on the current Ember version
18+
* `ember test --server` – Runs the test suite in "watch mode"
19+
* `ember try:each` – Runs the test suite against multiple Ember versions
20+
21+
## Running the dummy application
22+
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
25+
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

README.md

Lines changed: 97 additions & 97 deletions
Large diffs are not rendered by default.

config/ember-try.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ module.exports = function() {
3434
}
3535
}
3636
},
37+
{
38+
name: 'ember-lts-3.4',
39+
npm: {
40+
devDependencies: {
41+
'ember-source': '~3.4.0'
42+
}
43+
}
44+
},
3745
{
3846
name: 'ember-release',
3947
npm: {
@@ -58,6 +66,10 @@ module.exports = function() {
5866
}
5967
}
6068
},
69+
// The default `.travis.yml` runs this scenario via `yarn test`,
70+
// not via `ember try`. It's still included here so that running
71+
// `ember try:each` manually or from a customized CI config will run it
72+
// along with all the other scenarios.
6173
{
6274
name: 'ember-default',
6375
npm: {

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
"bootstrap-sass": "3.4.1",
5858
"bootswatch": "3.4.1",
5959
"broccoli-asset-rev": "^3.0.0",
60-
"ember-ajax": "^5.0.0",
61-
"ember-cli": "~3.5.1",
60+
"ember-cli": "~3.6.1",
6261
"ember-cli-app-version": "^3.1.0",
6362
"ember-cli-clock": "^3.0.0",
6463
"ember-cli-dependency-checker": "^3.0.0",
@@ -79,7 +78,7 @@
7978
"ember-maybe-import-regenerator": "^0.1.6",
8079
"ember-qunit": "^3.4.1",
8180
"ember-resolver": "^7.0.0",
82-
"ember-source": "~3.5.1",
81+
"ember-source": "~3.6.0",
8382
"ember-source-channel-url": "^2.0.1",
8483
"ember-try": "^1.0.0",
8584
"eslint-plugin-ember": "^5.2.0",

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.5.1",
6+
"version": "3.6.1",
77
"blueprints": [
88
{
99
"name": "addon",

0 commit comments

Comments
 (0)