Skip to content
Snippets Groups Projects
Commit 62dee8cf authored by Eric Eastwood's avatar Eric Eastwood
Browse files

Merge branch 'release/19.26.0'

parents f50105ef 1b05f57c
No related branches found
No related tags found
No related merge requests found
Pipeline #37289271 passed
......@@ -60,6 +60,21 @@ package:
- output/app/VERSION
expire_in: 1 week
mobile-asset-build:
<<: *node_job
stage: build_unit_test
only:
- master
script:
- npm run build-android-assets
- npm run build-ios-assets
artifacts:
paths:
- output/android/www
- output/ios/www
.distribute_job: &distribute_job
image: registry.gitlab.com/gitlab-org/gitter/webapp/deploy-build-image:latest
stage: pre_deploy
......
# 19.26.0 - 2018-11-19
- Add "Sign in" link to 404 page, https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1269
Developer Facing:
- Build mobile Android/iOS assets in CI for artifact usage in downstream Android/iOS builds, https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1272
# 19.25.0 - 2018-11-15
- Update `/apps` footer to match homepage
......
......@@ -4,6 +4,12 @@
Gitter<br>
<input id="error-text" class="error-input" size="55" readonly="readonly"><br><br>
{{#unless user}}
<p>
There may be a private chat room here but you are not signed in, <a href="/login?returnTo={{currentPath}}">sign in</a>
</p>
{{/unless}}
{{#if userMissingPrivateRepoScope}}
<p>If you're looking to access a private repository, you will need to upgrade your GitHub authentication to
allow us to access the list of your private repositories.</p>
......
......@@ -74,6 +74,7 @@ module.exports = function(err, req, res, next) { // eslint-disable-line no-unuse
res.render(template , _.extend({
status: status,
homeUrl: config.get('web:homeurl'),
currentPath: req.path,
user: req.user,
userMissingPrivateRepoScope: req.user && !userScopes.hasGitHubScope(req.user, 'repo'),
message: message,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment