Merge branch 'release/0.16.2'

.gitlab-ci.yml

@@ -28,7 +28,7 @@ review_front:
     - yarn run i18n-compile
     # this is to ensure we don't have any errors in the output,
     # cf https://code.eliotberriot.com/funkwhale/funkwhale/issues/169
-    - INSTANCE_URL=$REVIEW_INSTANCE_URL yarn run build | tee /dev/stderr | (! grep -i 'ERROR in')
+    - VUE_APP_INSTANCE_URL=$REVIEW_INSTANCE_URL yarn run build | tee /dev/stderr | (! grep -i 'ERROR in')
     - mkdir -p /static/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
     - cp -r dist/* /static/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
   cache:

CHANGELOG

@@ -10,6 +10,20 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.16.2 (2018-08-21)
+-------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/upgrading.html
+
+Bugfixes:
+
+- Ensure we always have a default api url set on first load to avoid displaying
+  the instance picker (#490)
+- Fixed CLI importer syntax error because of async reserved keyword usage
+  (#494)
+
+
 0.16.1 (2018-08-19)
 -------------------
 

api/funkwhale_api/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.16.1"
+__version__ = "0.16.2"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

api/funkwhale_api/providers/audiofile/management/commands/import_files.py

@@ -216,8 +216,8 @@ class Command(BaseCommand):
             message = "{i}/{total} Launching import for {path}..."
 
         # we create an import batch binded to the user
-        async = options["async"]
-        import_handler = tasks.import_job_run.delay if async else tasks.import_job_run
+        async_ = options["async"]
+        import_handler = tasks.import_job_run.delay if async_ else tasks.import_job_run
         batch = user.imports.create(source="shell")
         errors = []
         for i, path in list(enumerate(paths)):

front/src/App.vue

@@ -124,12 +124,13 @@ export default {
       // used to redraw ago dates every minute
       self.$store.commit('ui/computeLastDate')
     }, 1000 * 60)
-    if (this.$store.state.instance.instanceUrl) {
-      this.$store.commit('instance/instanceUrl', this.$store.state.instance.instanceUrl)
-      this.$store.dispatch('auth/check')
-      this.$store.dispatch('instance/fetchSettings')
-      this.fetchNodeInfo()
+    if (!this.$store.state.instance.instanceUrl) {
+      let defaultInstanceUrl = process.env.VUE_APP_INSTANCE_URL || this.$store.getters['instance/defaultUrl']()
+      this.$store.commit('instance/instanceUrl', defaultInstanceUrl)
     }
+    this.$store.dispatch('auth/check')
+    this.$store.dispatch('instance/fetchSettings')
+    this.fetchNodeInfo()
   },
   methods: {
     fetchNodeInfo () {

front/src/store/instance.js

@@ -14,7 +14,7 @@ export default {
   state: {
     maxEvents: 200,
     frontSettings: {},
-    instanceUrl: process.env.INSTANCE_URL,
+    instanceUrl: process.env.VUE_APP_INSTANCE_URL,
     events: [],
     settings: {
       instance: {