justinvdm

diff --git a/README.md b/README.md
index 40666c7..0a2c7d0 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,12 @@ Are added to the GitHub repo whenever a new tag is pushed.
 
 ## Release process
 
+`develop` is used for features currently in development, `master` for *production-ready* code.
+

justinvdm

diff --git a/mentorship/mentor/models.py b/mentorship/mentor/models.py
index 356b7b2..4f906a6 100644
--- a/mentorship/mentor/models.py
+++ b/mentorship/mentor/models.py
@@ -107,7 +107,7 @@ class Call(models.Model):
         response = api.make_call(
             self.caller.contact_number, self.receiver.contact_number)
         if response:
-            self.call_id = response.get('scheduled_call_id')
+            self.call_id = response.json().get('scheduled_call_id')

justinvdm

diff --git a/mentorship/comms/models.py b/mentorship/comms/models.py
index b8e9d1a..d27c644 100644
--- a/mentorship/comms/models.py
+++ b/mentorship/comms/models.py
@@ -20,6 +20,10 @@ def make_post_request(url, data, headers=None):
         data=data,
         headers=headers)
 
+    log.info(
+        'Received response: code=%r body=%r' %

justinvdm

diff --git a/src/views/Messages/MessageBubble/index.js b/src/views/Messages/MessageBubble/index.js
index 6475c9e..68caae6 100644
--- a/src/views/Messages/MessageBubble/index.js
+++ b/src/views/Messages/MessageBubble/index.js
@@ -18,7 +18,7 @@ const MessageBubble = ({
       <Text style={[baseStyles.content, styles.content]}>
         {content}
         {' '}
-        <Text style={baseStyles.time}>{moment(timestamp).format('HH:MM')}</Text>
+        <Text style={baseStyles.time}>{moment(timestamp).format('HH:mm')}</Text>

justinvdm

diff --git a/utils/dev-release.sh b/utils/dev-release.sh
index ba6ccb5..5e8bfc6 100755
--- a/utils/dev-release.sh
+++ b/utils/dev-release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 git checkout support/dev
-git merge develop
+git merge develop -X theirs
 ./utils/version.sh "$1"

justinvdm

diff --git a/.travis.yml b/.travis.yml
index ed18e77..6647038 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ before_install:
 - nvm install 6
 - node --version
 install:
-- npm install
+- travis_retry npm install

justinvdm

chat api

list

request

GET /mentor/chat_message/

justinvdm

diff --git a/utils/travis-release.sh b/utils/travis-release.sh
index 64962ef..db71e25 100755
--- a/utils/travis-release.sh
+++ b/utils/travis-release.sh
@@ -7,6 +7,6 @@ release() {
   TAG=$TRAVIS_TAG SENTRY_URL=$SENTRY_URL SENTRY_TOKEN=$SENTRY_TOKEN ./utils/sentry-upload-artefacts.sh
 }
 
-APK=$TRAVIS_TAG.apk ENVFILE=.env.prd SENTRY_URL=$SENTRY_PRD_URL SENTRY_TOKEN=$SENTRY_PRD_TOKEN release
+APK=mentorship-$TRAVIS_TAG.apk ENVFILE=.env.prd SENTRY_URL=$SENTRY_PRD_URL SENTRY_TOKEN=$SENTRY_PRD_TOKEN release

justinvdm

!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t(n.flume=n.flume||{})}(this,function(n){"use strict";function t(n,t){return t={exports:{}},n(t,t.exports),t.exports}function e(n){return function(t,e){return[null,n(e)]}}function r(n,t){function e(n,e){var r=t(n,e);return[r,r]}return{init:n,process:e}}function u(n){return function(t,e){return[null,v([n(e),e]).then(i)]}}function i(n){return n[0]?n[1]:y}function o(n,t){function e(n,e){return[n,t(n,e)]}return{init:n,process:e}}var f="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},c=t(function(n,t){!function(n,e){"function"==typeof n.define&&n.define.amd?n.define(e):"object"==typeof t?e(!0):n.flume=e()}(f,function(t){function e(){return new h}function r(n){function t(n,t,r){var u=x(e.inputs,n),i=u.length,o=-1;for(r=k(i,r||j);++o<i;)u[o].handle(t,r);return e}var e={};return e.dispatch=t,e.inputs=g(e,n),e}function u(n,t){retu

justinvdm

We couldn’t find that file to show.