7.x-2.6 (#89)

* 7.x-2.6

* Changing travis distro to precise

* Test against updated linky_clicky branch

* fixup! troubleshooting AJAX behat error

* Revert "fixup! troubleshooting AJAX behat error"

This reverts commit 2d30d95.

* Security updates for drupal and relation (#90)

* Security updates for drupal and relation

* Merging in t26 travis changes

* fixup! Test only failing features

* Revert "fixup! Test only failing features"

This reverts commit 83925c8.

* fixup! Test behat with chrome browser

* fixup! Troubleshooting scripts branch

* fixup! Bypass scripts branch check

.travis.yml

@@ -62,14 +62,16 @@ env:
     - BEHAT_TAG=""
     - DEPLOYER_BRANCH=""
     - DRUPAL_PROFILE_BRANCH=""
-    - CLICKY_BRANCH="remove_masonry_news"
+    - SCRIPTS_BRANCH="test-chrome-update"
+    - CLICKY_BRANCH="stanford-page-features-overridden"
     - SCRIPTS_BRANCH=""
 
 language: php
 php:
   - '5.6'
 
 sudo: required
+dist: precise
 
 cache:
   directories:
@@ -84,8 +86,8 @@ mysql:
 
 before_install:
   # download external repository with Stanford Travis CI scripts
-  - if [ ! -z $SCRIPTS_BRANCH ]; then SCRIPTS_BRANCH="-b $SCRIPTS_BRANCH"; fi
-  - git clone $SCRIPTS_BRANCH https://github.com/SU-SWS/stanford_travisci_scripts.git $HOME/stanford_travisci_scripts
+  # - if [ ! -z "$SCRIPTS_BRANCH" ]; then SCRIPTS_BRANCH="-b $SCRIPTS_BRANCH"; fi
+  - git clone -b test-chrome-update https://github.com/SU-SWS/stanford_travisci_scripts.git $HOME/stanford_travisci_scripts
   - chmod +x $HOME/stanford_travisci_scripts/bin/*.sh
   # install composer packages
   - $HOME/stanford_travisci_scripts/bin/before_install.sh

CHANGELOG.txt

@@ -1,6 +1,11 @@
 Stanford Profile 7.x-x.x xxxx-xx-xx
 -----------------------------------
 
+Stanford Profile 7.x-2.6 2017-09-26
+-----------------------------------
+- Various module updates in .make files
+- Fixed bug where stanford_page was installing in an overridden state
+
 Stanford Profile 7.x-2.5 2017-03-01
 -----------------------------------
 - Various module updates in .make files

README.md

@@ -1,5 +1,5 @@
 #[Stanford Drupal Profile](https://github.com/SU-SWS/Stanford-Drupal-Profile)
-##### Version: 7.x-2.6-dev
+##### Version: 7.x-2.6
 Maintainers: [Marco Wise](https://github.com/mistermarco), [John Bickar](https://github.com/jbickar), [Shea McKinney](https://github.com/sherakama)
 
 URL: [http://sites.stanford.edu](http://sites.stanford.edu)

make/stanford.make

@@ -1,7 +1,7 @@
 core = 7.x
 
 api = 2
-projects[drupal][version] = "7.52"
+projects[drupal][version] = "7.56"
 
 ; Contributed modules
 projects[admin_menu][subdir] = "contrib"
@@ -155,7 +155,7 @@ projects[proj4js][version] = "1.2"
 projects[redirect][subdir] = "contrib"
 projects[redirect][version] = "1.0-rc3"
 projects[relation][subdir] = "contrib"
-projects[relation][version] = "1.0"
+projects[relation][version] = "1.1"
 projects[rules][subdir] = "contrib"
 projects[rules][version] = "2.9"
 projects[services][subdir] = "contrib"
@@ -406,5 +406,5 @@ projects[stanford_seven][download][tag] = "7.x-1.1"
 projects[stanford][type] = "profile"
 projects[stanford][download][type] = "git"
 projects[stanford][download][url] = "[email protected]:SU-SWS/Stanford-Drupal-Profile.git"
-projects[stanford][download][tag] = 7.x-2.5
+projects[stanford][download][tag] = 7.x-2.6
 projects[stanford][subdir] = FALSE

stanford.info

@@ -1,7 +1,7 @@
 name = Stanford Sites
 description = Select this profile to install a version of Drupal customized for the Stanford Sites platform.
 core = 7.x
-version = 7.x-2.6-dev
+version = 7.x-2.6
 project status url = https://github.com/SU-SWS/Stanford-Drupal-Profile
 dependencies[] = advanced_help
 dependencies[] = auto_nodetitle