Merge branch 'master' of https://github.com/schmunk42/yii2-giiant int…

…o master
schmunk42 · Oct 15, 2020 · 7d27dd4 · 7d27dd4
2 parents 52a14ac + bf8bcfd
commit 7d27dd4
Show file tree

Hide file tree

Showing 21 changed files with 2,358 additions and 1,155 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ test:
     - docker-compose up -d
     # workaround (wait for db)
     - sleep 10
-    - docker-compose run phpfpm setup.sh
+    - make all
     - set +e
     - docker-compose run --rm -e YII_ENV=dev phpfpm bash -c 'codecept run --steps --html=_report.html -g mandatory -g ${GIIANT_TEST_DB} -g onlyCrud cli,unit,acceptance' || TESTS_EXIT_CODE=1
     - cp -r _output /tmp/${BUILD_PREFIX}
@@ -43,4 +43,4 @@ cleanup:
   script:
     - docker-compose kill && docker-compose rm -fv
     - docker-compose down --rmi local --volumes
-  when: always
+  when: always
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+### 1.0.0-beta
+
+- do not use auto-pluralization in views, pluralize via I18N
+- Improved model generation performance (see`modelCacheRelationsData`)
+
+### 0.13.0
+
+- fixed pivot URLs
+
 ### 0.12.0
 
  - Added support for `modelGenerateJunctionRelationMode`

diff --git a/README.md b/README.md
@@ -3,9 +3,7 @@ yii2-giiant
 
 > "Giiant is huge!"
 
-**PROJECT IS IN BETA STAGE!**
-
-[![Build Status](https://travis-ci.org/schmunk42/yii2-giiant.svg?branch=master)](https://travis-ci.org/schmunk42/yii2-giiant)
+[![Build Status](https://travis-ci.com/schmunk42/yii2-giiant.svg?branch=master)](https://travis-ci.com/schmunk42/yii2-giiant)
 
 What is this?
 -------------

diff --git a/composer.json b/composer.json
@@ -19,12 +19,13 @@
         "dmstr/yii2-db": "*",
         "friendsofphp/php-cs-fixer": "1.* || 2.*",
         "yiisoft/yii2": "~2.0.13",
-        "yiisoft/yii2-gii": "~2.2.0"
+        "yiisoft/yii2-gii": "^2.2.0"
     },
     "require-dev": {
         "codeception/codeception": "^2.2",
         "codeception/specify": "^0.4",
         "dmstr/yii2-web": "^0.4.2",
+        "yiisoft/yii2-faker": "2.*",
         "rmrevin/yii2-fontawesome": "2.*",
         "insolita/yii2-adminlte-widgets": "1.1.*"
     },