jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351175 )
Change subject: Implement Tool Labs membership application and processing ...................................................................... Implement Tool Labs membership application and processing * Bump striker submodule * Bump static submodule * Bump wheels submodule * Add database migration creating new model tables Bug: T162508 Change-Id: I72c3027c8be6b738015eac4e6e8ad8f645efb00a --- A ddl/20170501-01-T162508.sql M public_html/static M requirements.txt M striker M wheels 5 files changed, 113 insertions(+), 3 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/ddl/20170501-01-T162508.sql b/ddl/20170501-01-T162508.sql new file mode 100644 index 0000000..98aab22 --- /dev/null +++ b/ddl/20170501-01-T162508.sql @@ -0,0 +1,87 @@ +-- T162508: Tool Labs membership application and processing +-- Generated with mysqldump and hand edited by bd808 +-- +-- NOTE: requires a server with innodb_large_prefix enabled to support UNIQUE +-- indexes on varchar(255) columns with a utf8mb4. If innodb_large_prefix is +-- not enabled you will receive errors mentioning "Specified key was too long; +-- max key length is 767 bytes" + +-- Add new tools_accessrequest table +CREATE TABLE `tools_accessrequest` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `reason` longtext COLLATE utf8mb4_bin NOT NULL, + `created_date` datetime NOT NULL, + `admin_notes` longtext COLLATE utf8mb4_bin, + `status` varchar(1) COLLATE utf8mb4_bin NOT NULL, + `resolved_date` datetime DEFAULT NULL, + `resolved_by_id` int(11) DEFAULT NULL, + `user_id` int(11) NOT NULL, + `suppressed` tinyint(1) NOT NULL, + PRIMARY KEY (`id`), + KEY `tools_ac_resolved_by_id_4bc2bcd3f7ab8550_fk_labsauth_labsuser_id` (`resolved_by_id`), + KEY `tools_accessreq_user_id_4e853060c8b140f2_fk_labsauth_labsuser_id` (`user_id`), + KEY `tools_accessrequest_d5240003` (`created_date`), + KEY `tools_accessrequest_9acb4454` (`status`), + KEY `tools_accessrequest_4f431d97` (`suppressed`), + CONSTRAINT `tools_accessreq_user_id_4e853060c8b140f2_fk_labsauth_labsuser_id` FOREIGN KEY (`user_id`) REFERENCES `labsauth_labsuser` (`id`), + CONSTRAINT `tools_ac_resolved_by_id_4bc2bcd3f7ab8550_fk_labsauth_labsuser_id` FOREIGN KEY (`resolved_by_id`) REFERENCES `labsauth_labsuser` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC; + +-- Add new notifications_notification table +CREATE TABLE `notifications_notification` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `level` varchar(20) COLLATE utf8mb4_bin NOT NULL, + `unread` tinyint(1) NOT NULL, + `actor_object_id` varchar(255) COLLATE utf8mb4_bin NOT NULL, + `verb` varchar(255) COLLATE utf8mb4_bin NOT NULL, + `description` longtext COLLATE utf8mb4_bin, + `target_object_id` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL, + `action_object_object_id` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL, + `timestamp` datetime NOT NULL, + `public` tinyint(1) NOT NULL, + `action_object_content_type_id` int(11) DEFAULT NULL, + `actor_content_type_id` int(11) NOT NULL, + `recipient_id` int(11) NOT NULL, + `target_content_type_id` int(11) DEFAULT NULL, + `deleted` tinyint(1) NOT NULL, + `emailed` tinyint(1) NOT NULL, + `data` longtext COLLATE utf8mb4_bin, + PRIMARY KEY (`id`), + KEY `D51ab495b7f5bcab62c88325df2be900` (`action_object_content_type_id`), + KEY `f48a17791e09ec102d1b34d38e3a0474` (`actor_content_type_id`), + KEY `notificatio_recipient_id_6df06746b2eeab5_fk_labsauth_labsuser_id` (`recipient_id`), + KEY `D67b40cca018bb8b6a44239c7accec1d` (`target_content_type_id`), + CONSTRAINT `D51ab495b7f5bcab62c88325df2be900` FOREIGN KEY (`action_object_content_type_id`) REFERENCES `django_content_type` (`id`), + CONSTRAINT `D67b40cca018bb8b6a44239c7accec1d` FOREIGN KEY (`target_content_type_id`) REFERENCES `django_content_type` (`id`), + CONSTRAINT `f48a17791e09ec102d1b34d38e3a0474` FOREIGN KEY (`actor_content_type_id`) REFERENCES `django_content_type` (`id`), + CONSTRAINT `notificatio_recipient_id_6df06746b2eeab5_fk_labsauth_labsuser_id` FOREIGN KEY (`recipient_id`) REFERENCES `labsauth_labsuser` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC; + + +-- Drop bogus tables for LDAP models created before the LDAP model backend was +-- patched to keep them out of migrations. +DROP TABLE `tools_maintainer`; +DROP TABLE `tools_tool`; + +-- Update content type table for new models +LOCK TABLES `django_content_type` WRITE; +INSERT INTO `django_content_type` VALUES + (11,'labsauth','posixgroup'), + (12,'labsauth','posixaccount'), + (13,'labsauth','ldapuser'), + (14,'tools','accessrequest'), + (15,'notifications','notification'); +UNLOCK TABLES; + +-- Update migrations tracking table +LOCK TABLES `django_migrations` WRITE; +INSERT INTO `django_migrations` VALUES + (21,'labsauth','0002_ldapuser_posixaccount_posixgroup','2017-03-21 23:33:47'), + (25,'tools','0003_accessrequest','2017-03-27 04:59:23'), + (26,'tools','0004_accessrequest_suppress','2017-04-13 04:16:57'), + (27,'notifications','0001_initial','2017-04-13 04:52:57'), + (28,'notifications','0002_auto_20150224_1134','2017-04-13 04:52:57'), + (29,'notifications','0003_notification_data','2017-04-13 04:52:57'), + (30,'notifications','0004_auto_20150826_1508','2017-04-13 04:52:57'), + (31,'notifications','0005_auto_20160504_1520','2017-04-13 04:52:57'); +UNLOCK TABLES; diff --git a/public_html/static b/public_html/static index 9e41023..199cc37 160000 --- a/public_html/static +++ b/public_html/static @@ -1 +1 @@ -Subproject commit 9e41023614444c0e420e1bbd74fa64b123baeffe +Subproject commit 199cc37db073a20bff77bedeff38d66f55d407ec diff --git a/requirements.txt b/requirements.txt index 3810ca5..864add2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,10 @@ ## The following requirements were added by pip --freeze: +Babel==2.4.0 Django==1.8.14 PyJWT==1.4.2 cffi==1.7.0 cryptography==1.5 +debtcollector==1.13.0 django-auth-ldap==1.2.8 django-bootstrap3==7.0.1 django-csp==3.0 @@ -10,21 +12,42 @@ django-ipware==1.1.5 django-ldapdb==0.6.0 django-log-request-id==1.3.1 +django-model-utils==3.0.0 +django-notifications-hq==1.2 django-parsley==0.6 django-ratelimit-backend==1.0 ecdsa==0.13 idna==2.1 +iso8601==0.1.11 +jsonfield==2.0.1 +keystoneauth1==2.19.0 +monotonic==1.3 +msgpack-python==0.4.8 mwclient==0.8.2 mwoauth==0.2.8 mysqlclient==1.3.7 +netaddr==0.7.19 +netifaces==0.10.5 oauthlib==1.1.2 +oslo.config==4.1.0 +oslo.i18n==3.15.0 +oslo.serialization==2.18.0 +oslo.utils==3.25.0 +pbr==3.0.0 +positional==1.1.1 pyasn1==0.1.9 pycparser==2.14 pycrypto==2.6.1 pyldap==2.4.25.1 +pyparsing==2.2.0 +python-keystoneclient==3.10.0 python-logstash==0.4.6 python-memcached==1.58 +pytz==2017.2 requests==2.11.1 requests-oauthlib==0.6.2 +rfc3986==0.4.1 six==1.10.0 sshpubkeys==2.2.0 +stevedore==1.21.0 +wrapt==1.10.10 diff --git a/striker b/striker index b25908f..2626365 160000 --- a/striker +++ b/striker @@ -1 +1 @@ -Subproject commit b25908f191a23ef9936f43b9455b3a901b07fdee +Subproject commit 2626365d7e94d9f3979f034118da5f0823c4f36e diff --git a/wheels b/wheels index afdc35e..fb60063 160000 --- a/wheels +++ b/wheels @@ -1 +1 @@ -Subproject commit afdc35edc2d3f07118e7b8d67a941510c68549d3 +Subproject commit fb600632866262bf6572fa147eee49b1a0770725 -- To view, visit https://gerrit.wikimedia.org/r/351175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72c3027c8be6b738015eac4e6e8ad8f645efb00a Gerrit-PatchSet: 3 Gerrit-Project: labs/striker/deploy Gerrit-Branch: master Gerrit-Owner: BryanDavis <[email protected]> Gerrit-Reviewer: BryanDavis <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
