Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚀 Release v6.5.0-rc.2 #11391

Merged
merged 20 commits into from
Jul 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
77d43b8
fix: resolve invalid conflict resolution #11077 for v6.5
Jun 27, 2018
e2571bb
Merge pull request #11356 from DanielRuf/fix/use-local-this
ncoden Jun 27, 2018
861aede
Use pull request #11350 from ncoden/fix/fix-update-bower-config for v…
ncoden Jul 6, 2018
6a7343b
Use pull request #11352 from ncoden/chore/update-dev-jauery-against-c…
ncoden Jul 6, 2018
a064df9
Use pull request #11361 from ncoden/fix/xy-grid-zf-size-outside-of-br…
ncoden Jul 6, 2018
162b00e
Use pull request #11367 from ncoden/fix/fix-bower-json-11364 for v6.5.0
ncoden Jul 6, 2018
1080d97
Use pull request #11104 from zurb/andycochran/8833-input-group-label-…
Jul 6, 2018
6f5021f
Use pull request #11366 from ncoden/fix/check-listeners-before-unbind…
ncoden Jul 6, 2018
931888e
Use pull request #11368 from DanielRuf/style/use-typeof-for-checking-…
DanielRuf Jul 6, 2018
2428173
Use pull request #11373 from rlhawk/responsive-toggle for v6.5.0
rlhawk Jul 6, 2018
2f89438
Use pull request #11346 from ncoden/fix/gulp-deploy-task-multiple-com…
ncoden Jul 6, 2018
8b5cdf1
Use pull request #11377 from rlhawk/dropdown-menu for v6.5.0
rlhawk Jul 6, 2018
78f315b
Use pull request #11379 from absolunet/fix-elseif for v6.5.0
jblandry Jul 6, 2018
41d01e5
Use pull request #11382 from ncoden/docs/media-query-global-styles-no…
ncoden Jul 6, 2018
d9ad96c
Use pull request #11378 from ncoden/docs/improve-gitflow-model-for-su…
ncoden Jul 6, 2018
f57103f
Use pull request #11381 from ncoden/fix/initialize-media-query for v6…
ncoden Jul 8, 2018
ed271ce
Use pull request #11389 from chore/update-dependencies-2018-07-06 for…
ncoden Jul 8, 2018
ade0f74
chore: bump version for for v6.5.0-rc.2
ncoden Jul 8, 2018
31bcd7c
chore: generate dist files for v6.5.0-rc.2
ncoden Jul 9, 2018
ffab17c
docs: update documentation for v6.5.0-rc.1
ncoden Jul 9, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- [ ] There are no other pull request similar to this one.
- [ ] The pull request title is descriptive.
- [ ] The template is fully and correctly filled.
- [ ] The pull request targets the right branch (`develop` or `support/*`).
- [ ] The pull request targets the right branch (`develop` or `develop-v...`).
- [ ] My commits are correctly titled and contain all relevant information.
- [ ] My code follows the code style of this project.
- [ ] I have updated the documentation accordingly to my changes (if relevant).
Expand Down
20 changes: 12 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,31 @@ After you made these checks, please follow these advices to create your pull req
5. **Make sure that everything works and tests pass**.
You must absolutely check that everything still works after your changes. Please also add tests for features you added or uncovered bugs you fixed. See the [Testing](https://github.com/zurb/foundation-sites#testing) section.
6. **Create your pull request** ([link](https://github.com/zurb/foundation-sites/compare)).
Make sure it targets the right branch: most often `develop`, unless you provide a fix for an older version and it should be `support/*`. Take a look at our [Git Workflow](#git-workflow) below.
Make sure it targets the right branch: most often `develop`, unless you provide a fix for an older version and it should be `develop-v...`. Take a look at our [Git Workflow](#git-workflow) below.

When you submit a pull request, @mention a few people you’d like to help you review it. Once those people have signed off on it, the pull request can be merged! Core Team members will handle the merge itself.

## Git Workflow

Foundation uses a Git workflow close to the the successful [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/) branching model, to which we added "support" branches to be able to release patches for older Foundation versions. Most of the time you will not have to care about this workflow and can simply open your pull request on `develop`.
Foundation uses a Git workflow close to the the successful [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/) branching model, to which we added `develop-v...` and `master-v...` branches to prepare and release patches for older Foundation versions. Most of the time you will not have to care about this workflow and can simply open your pull request on `develop`.

The workflow relies on three branches:

- **`master`**
- **`develop`**

The stable branch. It only contains the latest stable version released. **Do NOT open pull requests on it**.
Used to prepare the next minor/major version. It always contains all the new features and bug fixes, and is the most up-to-date version of Foundation. Almost every pull request should be opened on this branch (fixes, features, documentation...). When a new version is released, it is merged on `master`, a dedicated `develop-v...` branch is created, and `develop` now targets the next version.

- **`develop`**
- **`develop-<version>`**

Used to prepare the next minor/major version. It always contains all the new features and bug fixes, and is the most up-to-date version of Foundation. Almost every pull request should be opened on this branch (fixes, features, documentation...). When a new version is released, it is merged on `master`, a support branch is created, and `develop` now targets the next version.
Used to prepare patches for previous versions. For example: `develop-v6.5` to prepare the `v6.5.1` release. When a pull request for a bug fix is merged on `develop` and is compatible with supported versions, its commits must be added on the compatible `develop-v...` branches too. If a fix is not compatible with `develop`, a pull request can be opened on the latest compatible and supported `develop-v...` branch. When a new patch is released, it is merged on `master-v...` and `develop-v...` now targets the next patch for this minor version.

- **`master`**

The stable branch. It only contains the latest stable version released. **Do NOT open pull requests on it**.

- **`support/<version>`**
- **`master-<version>`**

Used to support the previous versions (i.e. `support/v6.5` for `v6.5.0`) and prepare patches (i.e. `v6.5.1`). When a pull request for a bug fix is merged on `develop` and is compatible with supported versions, its commits must be added on the compatible `support/*` branches too. A patch version can be then released. If a fix is not compatible with `develop`, a pull request can be opened on the latest compatible and supported `support/*` branch.
The stable branch for previous versions. For example: `master-v6.5` for stable `v6.5.*` releases. **Do NOT open pull requests on it**.

This git workflow was fully adopted as of `v6.5`, so `v6.4` and previous versions are not supported.

Expand Down
69 changes: 56 additions & 13 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,73 @@
{
"name": "foundation-sites",
"version": "6.5.0-rc.1",
"version": "6.5.0-rc.2",
"description": "The most advanced responsive front-end framework in the world.",
"homepage": "http://foundation.zurb.com/sites",
"license": "MIT",
"keywords": [
"css",
"scss",
"sass",
"js",
"responsive",
"mobile-first",
"framework",
"eyeglass-module"
],
"authors": [
"ZURB <foundation@zurb.com> (http://foundation.zurb.com)"
],
"main": [
"scss/foundation.scss",
"dist/js/foundation.js"
],
"moduleType": [
"globals",
"amd",
"node",
"es6"
],
"repository": {
"type": "git",
"url": "https://github.com/zurb/foundation-sites"
},
"dependencies": {
"jquery": ">=2.2.0",
"what-input": ">=4.1.0"
},
"ignore": [
"config",
"docs",
"gulp",
"lib",
"test",
".babelrc",
".browserslistrc",
".commitlintrc.yml",
".editorconfig",
".eslintrc",
".huskyrc.yml",
".jshintrc",
".sass-lint.yml",
".travis.yml",
".versions",
"bower.json",
"browserstack.json",
"code-of-conduct.md",
"composer.json",
"CONTRIBUTING.md",
"docslink.sh",
"gulpfile.js",
"meteor-README.md",
"package.js",
"package.json",
"package-lock.json",
"sache.json",
".editorconfig",
".npm",
".gitignore",
".npmignore",
".versions",
".babelrc",
"yarn.lock"
"webpack.config.js",
"yarn.lock",
".github",
"config",
"customizer",
"docs",
"gulp",
"lib",
"spec",
"script",
"test"
]
}
7 changes: 4 additions & 3 deletions dist/css/foundation-float.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.min.css.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions dist/css/foundation-prototype.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation-prototype.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-prototype.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-prototype.min.css.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions dist/css/foundation-rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation-rtl.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-rtl.min.css.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions dist/css/foundation.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation.min.css.map

Large diffs are not rendered by default.

Loading