branch develop updated (98d61191 -> c5cc827e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 98d61191 modification de la version de Pollen new c5cc827e ajout du eslint dans le build du js The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c5cc827e1d11d7b1c14ba01a5bbe7b84563fb602 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 18:13:13 2018 +0200 ajout du eslint dans le build du js Summary of changes: .gitlab-ci.yml | 1 + pollen-ui-riot-js/.eslintrc | 6 ++++-- pollen-ui-riot-js/src/main/web/conf.js | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit c5cc827e1d11d7b1c14ba01a5bbe7b84563fb602 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 18:13:13 2018 +0200 ajout du eslint dans le build du js --- .gitlab-ci.yml | 1 + pollen-ui-riot-js/.eslintrc | 6 ++++-- pollen-ui-riot-js/src/main/web/conf.js | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 053b4787..d8e468d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ build-js: stage: build script: - cd pollen-ui-riot-js; npm install + - eslint src/main/ - npm run-script package artifacts: paths: diff --git a/pollen-ui-riot-js/.eslintrc b/pollen-ui-riot-js/.eslintrc index 260ac1b3..b63cb0c6 100644 --- a/pollen-ui-riot-js/.eslintrc +++ b/pollen-ui-riot-js/.eslintrc @@ -2,12 +2,14 @@ "globals": { "console": false, "debugger": false, - "confirm": true, + "confirm": true, "define": true, "require": true, "Immutable": true, "module": true, - "riot": true + "riot": true, + "POLLEN_API_URL": true, + "POLLEN_VERSION": true }, "env": { "browser": true, diff --git a/pollen-ui-riot-js/src/main/web/conf.js b/pollen-ui-riot-js/src/main/web/conf.js index 5e1887b6..1e76631e 100644 --- a/pollen-ui-riot-js/src/main/web/conf.js +++ b/pollen-ui-riot-js/src/main/web/conf.js @@ -8,12 +8,12 @@ * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm