Skip to content
This repository has been archived by the owner on Nov 16, 2021. It is now read-only.

Commit

Permalink
Issue #2912171: [META] Lightning 8.x-2.21
Browse files Browse the repository at this point in the history
  • Loading branch information
balsama committed Oct 25, 2017
1 parent 62c94fe commit 52c4b8f
Show file tree
Hide file tree
Showing 33 changed files with 62 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ php:
- 7.0.22
env:
- VERSION=HEAD
- VERSION=2.2.1
- VERSION=2.2.0
- VERSION=2.1.8
- VERSION=2.1.7
- VERSION=2.1.6

addons:
apt:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## 2.2.1
* Lightning Media has been updated to use the new Core Media entity.
* Lightning Media has been updated to use the new Core Media system.
* Fixed a bug where the "Publishing status" checkbox appeared on content edit
forms when it should have been hidden. (GitHub #479)

Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ your environment, but generally you will not need to do this.
API.
* Some of the Lightning contributed media module listed above might not yet be
compatible with the Core Media entity.
* The Video Embed Field module, a dependency of Lightning Media, might report
that it is unsupported. We're working with the module maintainer to remove
this warning.

### Workflow
* Lightning Workflow is based on Workbench Moderation, which is incompatible
Expand Down
28 changes: 24 additions & 4 deletions UPDATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,29 @@ Prior to running the database updates, you must:
1. Ensure Composer properly downloaded and patched all dependencies.
1. Rebuild Drupal's caches.

Due to a some unresolved bugs with the composer-patches plugin, you might need
to delete your "/docroot/core" and "/docroot/modules" folders and your
composer.lock file before running `composer update`. If your codebase has been
updated properly, you should see the following four pending database updates:
This release changes the set of patches that are applied to drupal/core without
actually updating core, which exposes [this bug in the composer-patches plugin](https://github.com/cweagans/composer-patches/issues/71).
As a result, you will likely need to run composer update twice. Specifically:

```
composer update acquia/lightning --with-dependencies
composer update drupal/core
```

Alternatively, you can delete your "/docroot/core" and "/docroot/modules"
folders and your composer.lock file before running `composer update`. If you use
[BLT](http://blt.readthedocs.io/en/8.x/), the provided `composer nuke` command
will do that for you.

Once you have confirmed that your codebase has been update properly, you must
rebuild your site's caches *before* running the database updates.

```
drush cache-rebuild
```

If your codebase has been updated properly, you should see the following four
pending database updates when you run `drush updatedb`:

```
lightning_api module :
Expand All @@ -102,6 +121,7 @@ media_entity module :
8201 - Replace Media Entity with Media.
```


##### Configuration updates
* Visit *Structure > Content types*. For each moderated content type, click
"Manage form display", then drag the "Publishing status" field into the
Expand Down
2 changes: 1 addition & 1 deletion build-lightning.make
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ includes[] = drupal-org-core.make
projects[lightning][type] = profile
projects[lightning][download][type] = git
projects[lightning][download][branch] = 8.x-2.x
projects[lightning][download][tag] = 8.x-2.21-dev
projects[lightning][download][tag] = 8.x-2.21
10 changes: 5 additions & 5 deletions composer.lock

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

2 changes: 1 addition & 1 deletion lightning.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Lightning
core: 8.x
type: profile
description: 'A fast and feature-rich Drupal distribution.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
distribution:
name: Lightning
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ core: 8.x
type: module
package: Lightning
description: 'Progressive decoupling? No problem.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- jsonapi
- openapi_redoc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ description: 'Contains configuration and support code for testing Headless Light
hidden: true
dependencies:
- lightning_api
version: '8.x-2.21-dev'
version: '8.x-2.21'
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ core: 8.x
type: module
package: Lightning
description: 'Shared functionality for the Lightning distribution.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- node
- path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ core: 8.x
type: module
package: Lightning
description: 'Provides a site-wide contact form with basic default configuration.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- contact_storage
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ core: 8.x
type: module
package: Lightning
description: 'Development tools for working on the Lightning distribution itself.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
hidden: true
dependencies:
- devel_generate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ package: Lightning
core: 8.x
type: module
description: 'Provides a "Basic Page" content type that is, indeed, very basic.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- lightning_core
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ core: 8.x
type: module
package: Lightning
description: 'Automatically manages user roles and permissions.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ core: 8.x
type: module
package: Lightning
description: 'A basic but powerful set of default configuration for searching your site.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- lightning_core
- search_api
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ core: 8.x
type: module
description: 'Contains configuration and support code for running Lightning functional tests.'
package: Lightning
version: '8.x-2.21-dev'
version: '8.x-2.21'
hidden: true
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Lightning Layout'
core: 8.x
type: module
description: 'Provides the tools to take control of your layout.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
package: Lightning
dependencies:
- lightning_core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ package: Lightning
core: 8.x
type: module
description: 'Provides a content type which allows you to build free-form one-off landing pages.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- lightning_layout
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Lightning Media'
core: 8.x
type: module
description: 'Slick media handling for Lightning. So cool you''ll make the A/C jealous.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
package: Lightning
dependencies:
- ckeditor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Bulk Media Upload'
core: 8.x
type: module
description: 'Provides a form to upload many media items at once.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
package: Lightning
dependencies:
- dropzonejs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Media Document'
core: 8.x
type: module
description: 'Locally hosted document support for Lightning Media.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
package: Lightning
dependencies:
- lightning_media
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ core: 8.x
type: module
package: Lightning
description: 'Image support for Lightning Media.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- lightning_media
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Media Instagram'
core: 8.x
type: module
description: 'Instagram support for Lightning Media.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
package: Lightning
dependencies:
- lightning_media
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ core: 8.x
type: module
package: Lightning
description: 'Twitter support for Lightning Media.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- lightning_media
- media_entity_twitter
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ core: 8.x
type: module
package: Lightning
description: 'Video support for Lightning Media.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
dependencies:
- lightning_media
- video_embed_media
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Lightning Workflow'
core: 8.x
type: module
description: 'Tools to improve your content workflow.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
package: Lightning
dependencies:
- lightning_core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Schedule Publication'
core: 8.x
type: module
description: 'Allows authors to schedule publication of content.'
version: '8.x-2.21-dev'
version: '8.x-2.21'
package: Lightning
dependencies:
- inline_entity_form
Expand Down
4 changes: 2 additions & 2 deletions tests/config/entity_browser.browser.image_browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ widgets:
weight: -9
label: Upload
id: file_upload
ae9802c0-e4bb-44ec-993c-520f58216cfd:
3e6ad6ad-dc0e-48d5-b315-8833c962dcbe:
settings:
view: media
view_display: entity_browser_2
submit_text: Select
auto_select: false
uuid: ae9802c0-e4bb-44ec-993c-520f58216cfd
uuid: 3e6ad6ad-dc0e-48d5-b315-8833c962dcbe
weight: -10
label: Library
id: view
4 changes: 2 additions & 2 deletions tests/config/entity_browser.browser.media_browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ widgets:
weight: -9
label: Upload
id: file_upload
fc86155c-3750-440f-94cf-bb367ddbc50b:
5537d437-1c08-4de8-b450-f42027f59440:
settings:
view: media
view_display: entity_browser_1
submit_text: Place
auto_select: false
uuid: fc86155c-3750-440f-94cf-bb367ddbc50b
uuid: 5537d437-1c08-4de8-b450-f42027f59440
weight: -10
label: Library
id: view
Binary file removed tests/fixtures/2.1.6.sql.bz2
Binary file not shown.
Binary file added tests/fixtures/2.2.1.sql.bz2
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ hidden: true
dependencies:
- lightning_media_image
- lightning_page
version: '8.x-2.21-dev'
version: '8.x-2.21'
2 changes: 1 addition & 1 deletion tests/modules/view_mode_test/view_mode_test.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ hidden: true
dependencies:
- lightning_core
- node
version: '8.x-2.21-dev'
version: '8.x-2.21'

0 comments on commit 52c4b8f

Please sign in to comment.