Commit d7f05f96 authored by Eric Eastwood's avatar Eric Eastwood

Update Gitter group references after moving from the gitlab-org group

Part of #2606
parent 94fd9163
Pipeline #216993483 passed with stages
in 27 minutes and 47 seconds
This diff is collapsed.
FROM registry.gitlab.com/gitlab-org/gitter/webapp:latest
FROM registry.gitlab.com/gitterhq/webapp:latest
WORKDIR /app
......
......@@ -38,7 +38,7 @@ Follow these instructions to setup an environment to hack on Gitter.
* If you are on Windows, you can use [nvm-windows](https://github.com/coreybutler/nvm-windows)
1. Install **npm 6.x**
* Node **10.x** already comes with **npm 6.x**. Otherwise, you can install manually with `npm install npm@^6.x -g`
1. Clone this repo: `git clone https://gitlab.com/gitlab-org/gitter/webapp.git`
1. Clone this repo: `git clone https://gitlab.com/gitterHQ/webapp.git`
1. Run `npm install`
* Go and make a cup of tea, because this will take a rather long time.
......@@ -81,7 +81,7 @@ The simplest way to run Gitter `webapp` is to start it without [OAuth configurat
*Warning: When you delete the containers (by running `docker-compose down` or `docker-compose up` without `--no-recreate`) you'll have to generate new seed data.*
*If you are interested in improving this process, please visit https://gitlab.com/gitlab-org/gitter/webapp/issues/2463*
*If you are interested in improving this process, please visit https://gitlab.com/gitterHQ/webapp/issues/2463*
### Configure OAuth and service secrets
......@@ -93,7 +93,7 @@ Gitter connects to third party APIs. In order to do this, you will need to gener
You only need to collect the secrets once. But you need to export the environment variables in any new terminal session.
In the future, we hope to streamline this process and skip OAuth providers. You can track https://gitlab.com/gitlab-org/gitter/webapp/issues/1973
In the future, we hope to streamline this process and skip OAuth providers. You can track https://gitlab.com/gitterHQ/webapp/issues/1973
#### Mac
......@@ -212,7 +212,7 @@ docker-compose rm -f
### Going further
We also have some other docs which give a [overview/walkthrough of the codebase](https://gitlab.com/gitlab-org/gitter/webapp/blob/develop/docs/code-overview.md)
We also have some other docs which give a [overview/walkthrough of the codebase](https://gitlab.com/gitterHQ/webapp/blob/develop/docs/code-overview.md)
and [some notes on touching production](https://gitlab.com/gl-infra/gitter-infrastructure/blob/master/README.md).
......@@ -240,7 +240,7 @@ Just add all of the variables from your `.env` file to your forked projects [**S
After adding the variables, just retry the pipeline.
You can look at the [issues labeled with ~"test"](https://gitlab.com/gitlab-org/gitter/webapp/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=test) for any known problems.
You can look at the [issues labeled with ~"test"](https://gitlab.com/gitterHQ/webapp/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=test) for any known problems.
### Testing
......
......@@ -24,7 +24,7 @@ services:
]
mongo1:
image: registry.gitlab.com/gitlab-org/gitter/webapp/mongo:latest
image: registry.gitlab.com/gitterhq/webapp/mongo:latest
restart: always
volumes:
- gitter-mongodb:/data/db2
......@@ -48,7 +48,7 @@ services:
# The official elasticsearch:1.4.2 image with mapper-attachments and river-mongodb plugins
# https://github.com/soldotno/elasticsearch-river-mongodb/blob/master/Dockerfile
elasticsearch:
image: registry.gitlab.com/gitlab-org/gitter/webapp/elasticsearch:latest
image: registry.gitlab.com/gitterhq/webapp/elasticsearch:latest
ports:
- '9200:9200'
- '9300:9300'
......
......@@ -9,7 +9,7 @@ If you updated some info on GitLab/GitHub/Twitter, sign out of Gitter and sign b
There isn't a way to merge accounts.
We will probably introduce this capability after we add the [ability to set your own username](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/1851). You can track [this issue](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/1752) for linking different accounts together.
We will probably introduce this capability after we add the [ability to set your own username](https://gitlab.com/gitterHQ/webapp/-/issues/1851). You can track [this issue](https://gitlab.com/gitterHQ/webapp/-/issues/1752) for linking different accounts together.
## Can I change my username?
......@@ -26,14 +26,14 @@ See above, you can't change your username.
We add the `_gitlab`/`_twitter` suffix to avoid name collisions with GitHub.
If you don't want the suffix added, sign in with GitHub.
You can track [#1851](https://gitlab.com/gitlab-org/gitter/webapp/issues/1851)
You can track [#1851](https://gitlab.com/gitterHQ/webapp/issues/1851)
for the ability to customize your username in the future and remove the suffix.
## How do I update my avatar?
Sign out of Gitter and sign back in to update your avatar (or any other info).
Currently, there is an outstanding bug where this doesn't work with GitLab/Twitter accounts, https://gitlab.com/gitlab-org/gitter/webapp/issues/1834
Currently, there is an outstanding bug where this doesn't work with GitLab/Twitter accounts, https://gitlab.com/gitterHQ/webapp/issues/1834
## How do I export my data?
......
......@@ -60,8 +60,8 @@ Gitter uses a number of backend persistence services:
The ELB balances the load between 8 webapp EC2 instances. Each webapp instance runs:
- 2 web express servers started from the [`server/web.js`](https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/server/web.js)
- 2 API express servers started from [`server/api.js`](https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/server/api.js)
- 2 web express servers started from the [`server/web.js`](https://gitlab.com/gitterHQ/webapp/-/blob/develop/server/web.js)
- 2 API express servers started from [`server/api.js`](https://gitlab.com/gitterHQ/webapp/-/blob/develop/server/api.js)
And users Nginx as a reverse proxy to route the incoming traffic based on the request path.
......
......@@ -13,7 +13,7 @@ Use the **+** -> **Create community** option in the bottom-left of the menu bar
If you sign in with GitLab, communities can be associated with a [GitLab group](https://docs.gitlab.com/ee/user/group/) or [project](https://docs.gitlab.com/ee/user/project/). Just click the link in the "do you want to start a community for one of your GitLab groups/projects?" phrase below the name and URI inputs.
Gitter communities based on your personal GitLab user namespace are not supported yet but we plan to follow up soon after -> https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2397
Gitter communities based on your personal GitLab user namespace are not supported yet but we plan to follow up soon after -> https://gitlab.com/gitterHQ/webapp/-/issues/2397
### Associate your community with GitHub
......
......@@ -65,7 +65,7 @@ Alternatively to copying the whole `config/config.dev.json` over you can just us
The OAuth callbacks you created initially have a `localhost:5000` redirect URI
which will just 404 on a separate device when you try to sign in.
Recreate your secrets using your local network IP, see https://gitlab.com/gitlab-org/gitter/webapp#configure-service-secrets
Recreate your secrets using your local network IP, see https://gitlab.com/gitterHQ/webapp#configure-service-secrets
Restart the server. You should now be able to access Gitter over your local IP from other devices
......
......@@ -8,7 +8,7 @@ Gitter is entirely free for all public and private conversations.
## I have a suggestion, where can I suggest/discuss it?
Feel free to come discuss your idea in the [`gitter/gitter`](https://gitter.im/gitter/gitter) room and create an issue, https://gitlab.com/gitlab-org/gitter/webapp/issues
Feel free to come discuss your idea in the [`gitter/gitter`](https://gitter.im/gitter/gitter) room and create an issue, https://gitlab.com/gitterHQ/webapp/issues
## Help! Do you have any Support?
......
......@@ -97,7 +97,7 @@ Threaded conversations allow you to better organize your messages by discussing
### Support in mobile apps
Threads are minimally supported in the mobile apps and the [mobile apps overall may be deprecated](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2281) in the future.
Threads are minimally supported in the mobile apps and the [mobile apps overall may be deprecated](https://gitlab.com/gitterHQ/webapp/-/issues/2281) in the future.
Every thread message appears in the main message feed and it is marked as being part of a thread. When you click on the indicator, you are taken into a web browser that will show you the whole thread. *The mobile apps don't provide a way to write threaded messages.*
......@@ -107,12 +107,12 @@ Every thread message appears in the main message feed and it is marked as being
The threaded conversations don't have feature parity with the main messages yet. The main missing features are:
- [Typeahead in the message input](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2344) - usernames, emojis, issues
- [Decorating messages](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2340) - user profile popover, issue states
- [Replying workflows](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2341) - clicking @username populating the message input with the handle
- [Composing multiline messages](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2338)
- [Threaded conversation notifications - Unfollow thread](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2483)
- [Thread summary overview](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2431)
- [Typeahead in the message input](https://gitlab.com/gitterHQ/webapp/-/issues/2344) - usernames, emojis, issues
- [Decorating messages](https://gitlab.com/gitterHQ/webapp/-/issues/2340) - user profile popover, issue states
- [Replying workflows](https://gitlab.com/gitterHQ/webapp/-/issues/2341) - clicking @username populating the message input with the handle
- [Composing multiline messages](https://gitlab.com/gitterHQ/webapp/-/issues/2338)
- [Threaded conversation notifications - Unfollow thread](https://gitlab.com/gitterHQ/webapp/-/issues/2483)
- [Thread summary overview](https://gitlab.com/gitterHQ/webapp/-/issues/2431)
Please see the full list of outstanding features in the [Threaded Conversations Epic](https://gitlab.com/groups/gitlab-org/-/epics/360)
......@@ -179,7 +179,7 @@ You can use the `word1 -word2` syntax to find messages containing `word1` but _n
You can access a rooms message archive via the **Room settings dropdown** -> **Archives**.
The archive heatmap currently only shows a year but you can manually navigate by changing the URL. You can [track this issue for increasing the heatmap size](https://gitlab.com/gitlab-org/gitter/webapp/issues/785)
The archive heatmap currently only shows a year but you can manually navigate by changing the URL. You can [track this issue for increasing the heatmap size](https://gitlab.com/gitterHQ/webapp/issues/785)
![](https://i.imgur.com/L8VrjAn.png)
......
......@@ -16,7 +16,7 @@ You will be notified of all messages in a room and see a corresponding number if
You will only see a subtle activity indicator for new unread messages. You will receive notifications if you are directly mentioned or there's an announcement (@/all).
Note: You will also get email notifications for all unread messages because that area of code coupled to email at the moment, see https://gitlab.com/gitlab-org/gitter/webapp/issues/1205
Note: You will also get email notifications for all unread messages because that area of code coupled to email at the moment, see https://gitlab.com/gitterHQ/webapp/issues/1205
#### Mute
......@@ -51,7 +51,7 @@ If you would like to change how you are notified on the Desktop, access the Gitt
When you have a Gitter instance open on a desktop/browser, we don't send a notification to your mobile device to avoid double-buzzing.
We understand this can be unexpected and undesirable. You can track the following issue: https://gitlab.com/gitlab-org/gitter/webapp/issues/1846
We understand this can be unexpected and undesirable. You can track the following issue: https://gitlab.com/gitterHQ/webapp/issues/1846
For Android, there is also an open bug around push notifications, https://gitlab.com/gitlab-org/gitter/gitter-android-app/issues/121
......@@ -60,7 +60,7 @@ For Android, there is also an open bug around push notifications, https://gitlab
You can toggle email notifications on and off in the "Configure Defaults" section of the notification modal. There is also an unsubscribe link at the bottom of each notification email that does the same thing.
Emails are batched up and sent in 1 hour chunks. You can track [this issue](https://gitlab.com/gitlab-org/gitter/webapp/issues/143) for more immediate email notifications.
Emails are batched up and sent in 1 hour chunks. You can track [this issue](https://gitlab.com/gitterHQ/webapp/issues/143) for more immediate email notifications.
If you are using the [IRC bridge](https://irc.gitter.im/), it will mark every message as read so you won't receive any emails.
......
......@@ -2,7 +2,7 @@
## GitLab
You can sign in via GitLab. Your username will have a `_gitlab` suffix. You can track [this issue for getting rid of the suffix and being able to change your username](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/1851).
You can sign in via GitLab. Your username will have a `_gitlab` suffix. You can track [this issue for getting rid of the suffix and being able to change your username](https://gitlab.com/gitterHQ/webapp/-/issues/1851).
We request following GitLab OAuth scopes:
......@@ -20,7 +20,7 @@ You can see how we have the GitLab OAuth application settings configured:
### Twitter
You can sign in via Twitter. Your username will have a `_twitter` suffix. You can track [this issue for getting rid of the suffix and being able to change your username](https://gitlab.com/gitlab-org/gitter/webapp/-/issues/1851).
You can sign in via Twitter. Your username will have a `_twitter` suffix. You can track [this issue for getting rid of the suffix and being able to change your username](https://gitlab.com/gitterHQ/webapp/-/issues/1851).
For Twitter, we are requesting the bare minimum `Read-only` permissions. We add the email permission so we can send unread notification emails. You can see how we have permissions configured in our Twitter developer dashboard:
......
......@@ -91,7 +91,7 @@ Send a message to support@gitter.im with the following info. Make sure to email
- New desired public/private security or repo/org association
- Some context behind the change
You can track https://gitlab.com/gitlab-org/gitter/webapp/issues/676 for progress on this issue.
You can track https://gitlab.com/gitterHQ/webapp/issues/676 for progress on this issue.
......
......@@ -50,19 +50,19 @@ pushing to any remote besides `dev.gitlab.org`, in order to prevent accidental d
## Backport the change
Backport the change to the [public `webapp` project](https://gitlab.com/gitlab-org/gitter/webapp)
Backport the change to the [public `webapp` project](https://gitlab.com/gitterHQ/webapp)
```
git push origin master
git push origin developer
git push --tags origin
```
You can cancel the hotfix tag pipeline in https://gitlab.com/gitlab-org/gitter/webapp
You can cancel the hotfix tag pipeline in https://gitlab.com/gitterHQ/webapp
Add the hotfix to the [changelog](https://gitlab.com/gitlab-org/gitter/webapp/blob/develop/CHANGELOG.md). Link the confidential issue for all the details that will be public at a later time. Description *ideally* shouldn't explain how to reproduce the issue (e.g. `Fix integration activity XSS` instead of `Stored XSS via Wiki links`). Link the HackerOne profile of the person disclosing the issue (`https://hackerone.com/{user name}`).
Add the hotfix to the [changelog](https://gitlab.com/gitterHQ/webapp/blob/develop/CHANGELOG.md). Link the confidential issue for all the details that will be public at a later time. Description *ideally* shouldn't explain how to reproduce the issue (e.g. `Fix integration activity XSS` instead of `Stored XSS via Wiki links`). Link the HackerOne profile of the person disclosing the issue (`https://hackerone.com/{user name}`).
Example:
```markdown
- Fix integration activity XSS, https://gitlab.com/gitlab-org/gitter/webapp/issues/2068
- Fix integration activity XSS, https://gitlab.com/gitterHQ/webapp/issues/2068
- Thanks to [@mishre](https://hackerone.com/mishre) for [responsibly disclosing](https://matrix.org/security-disclosure-policy/) this vulnerability to us.
- https://dev.gitlab.org/gitlab/gitter/webapp/merge_requests/1
```
......@@ -11,10 +11,10 @@ E --> F[message gets rendered into the main message flow]
```
## User typed in a message and pressed `Enter`
1. [ChatInputBoxView.send](https://gitlab.com/gitlab-org/gitter/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/views/chat/chat-input-box-view.js#L248) adds the new message to `LiveCollection`.
- This collection is available from [`router-chat.js`](https://gitlab.com/gitlab-org/gitter/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/router-chat.js#L260) through [`ChatToolbarInput`](https://gitlab.com/gitlab-org/gitter/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/views/layouts/chat-toolbar-input.js#L109)
1. We use `backbone-proxy-collection` [wrapped by `chats-cached` collection](https://gitlab.com/gitlab-org/gitter/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/collections/instances/chats-cached.js#L30). This proxy collection uses [`ChatCollection`](https://gitlab.com/gitlab-org/gitter/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/collections/chat.js#L89) to define how the `LiveCollection` fetches data.
1. Thanks to this [`urlTemplate` set to `/v1/rooms/:troupeId/chatMessages`](https://gitlab.com/gitlab-org/gitter/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/collections/chat.js#L96) we send a POST request to API when [something is created in the chat collection](https://gitlab.com/gitlab-org/gitter/webapp/blob/fc20892381b2c23a0937d19329ea35a11282541e/public/js/views/chat/chat-input-box-view.js#L248).
1. [ChatInputBoxView.send](https://gitlab.com/gitterHQ/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/views/chat/chat-input-box-view.js#L248) adds the new message to `LiveCollection`.
- This collection is available from [`router-chat.js`](https://gitlab.com/gitterHQ/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/router-chat.js#L260) through [`ChatToolbarInput`](https://gitlab.com/gitterHQ/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/views/layouts/chat-toolbar-input.js#L109)
1. We use `backbone-proxy-collection` [wrapped by `chats-cached` collection](https://gitlab.com/gitterHQ/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/collections/instances/chats-cached.js#L30). This proxy collection uses [`ChatCollection`](https://gitlab.com/gitterHQ/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/collections/chat.js#L89) to define how the `LiveCollection` fetches data.
1. Thanks to this [`urlTemplate` set to `/v1/rooms/:troupeId/chatMessages`](https://gitlab.com/gitterHQ/webapp/blob/49cc5b37f6691e500dcb23b9dc57fd338ef1a02d/public/js/collections/chat.js#L96) we send a POST request to API when [something is created in the chat collection](https://gitlab.com/gitterHQ/webapp/blob/fc20892381b2c23a0937d19329ea35a11282541e/public/js/views/chat/chat-input-box-view.js#L248).
![Screenshot_2019-05-29_at_13.15.10](/uploads/b36cf0428a8970d2bf80b578352d6ecd/Screenshot_2019-05-29_at_13.15.10.png)
## API listens for POST requests on `/v1/rooms/:troupeId/chatMessages`
......@@ -25,9 +25,9 @@ B --> C[chat-service.js.newChatMessageToTroupe]
C --> D[new message to MongoDB chatMessage.save]
C --> E[unreadItemService.createChatUnreadItems]
```
1. [`server/api/v1/rooms/chat-messages.js`](https://gitlab.com/gitlab-org/gitter/webapp/blob/7984c4966f8322a319172400561f064372ff013c/server/api/v1/rooms/chat-messages.js) handles creation of the new message. The API folder structure copies the URL.
1. POST request invokes `create` method which [calls `chatService.newChatMessageToTroupe()`](https://gitlab.com/gitlab-org/gitter/webapp/blob/7984c4966f8322a319172400561f064372ff013c/server/api/v1/rooms/chat-messages.js#L85).
1. `chatService` [saves the newly created message](https://gitlab.com/gitlab-org/gitter/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/modules/chats/lib/chat-service.js#L191) to MongoDB.
1. [`server/api/v1/rooms/chat-messages.js`](https://gitlab.com/gitterHQ/webapp/blob/7984c4966f8322a319172400561f064372ff013c/server/api/v1/rooms/chat-messages.js) handles creation of the new message. The API folder structure copies the URL.
1. POST request invokes `create` method which [calls `chatService.newChatMessageToTroupe()`](https://gitlab.com/gitterHQ/webapp/blob/7984c4966f8322a319172400561f064372ff013c/server/api/v1/rooms/chat-messages.js#L85).
1. `chatService` [saves the newly created message](https://gitlab.com/gitterHQ/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/modules/chats/lib/chat-service.js#L191) to MongoDB.
<details>
<summary>Example of stored message</summary>
......@@ -53,7 +53,7 @@ C --> E[unreadItemService.createChatUnreadItems]
```
</details>
1. `chatService` [uses `unreadItemService` to `createChatUnreadItems`](https://gitlab.com/gitlab-org/gitter/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/modules/chats/lib/chat-service.js#L209).
1. `chatService` [uses `unreadItemService` to `createChatUnreadItems`](https://gitlab.com/gitterHQ/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/modules/chats/lib/chat-service.js#L209).
## Distribute a message to active users
```mermaid
......@@ -65,10 +65,10 @@ J --> K[serializeObject - appEvents.dataChange2]
K -.-> L[bayeux-events-bridge.js publish]
L --> M[bayeux/cluster.js publish]
```
1. `persistence-service-events` [adds a new listener on created chat message](https://gitlab.com/gitlab-org/gitter/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/services/persistence-service-events.js#L27) during application startup.
1. `live-collection-chat` [emits `dataChange2` with the new message](https://gitlab.com/gitlab-org/gitter/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/services/live-collection-handlers/live-collection-chats.js#L18).
1. `bayeux-events-bridge` listens on `dataChange2` and [publishes the message to a bayeux cluster](https://gitlab.com/gitlab-org/gitter/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/event-listeners/bayeux-events-bridge.js#L52).
1. `bayeux/cluster` [publishes the message](https://gitlab.com/gitlab-org/gitter/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/web/bayeux/cluster.js#L265) (internally it's using `redis-faye` to store the message to redis).
1. `persistence-service-events` [adds a new listener on created chat message](https://gitlab.com/gitterHQ/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/services/persistence-service-events.js#L27) during application startup.
1. `live-collection-chat` [emits `dataChange2` with the new message](https://gitlab.com/gitterHQ/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/services/live-collection-handlers/live-collection-chats.js#L18).
1. `bayeux-events-bridge` listens on `dataChange2` and [publishes the message to a bayeux cluster](https://gitlab.com/gitterHQ/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/event-listeners/bayeux-events-bridge.js#L52).
1. `bayeux/cluster` [publishes the message](https://gitlab.com/gitterHQ/webapp/blob/c4387f141ced8272cb6eb5731d19adb84d74d7bf/server/web/bayeux/cluster.js#L265) (internally it's using `redis-faye` to store the message to redis).
## Users subscribing to `chatMessages` channel.
There are multiple ways of listening to new messages in a room.
......@@ -76,13 +76,13 @@ There are multiple ways of listening to new messages in a room.
- long-polling used as a fallback
1. The [realtime-client uses](https://gitlab.com/gitlab-org/gitter/realtime-client/blob/9c11abd8a1206b712272a99aed49c95f1cb10471/lib/realtime-client.js#L308) [`gitter/halley`](https://gitlab.com/gitlab-org/gitter/halley) client to subscribe to [`/bayeux` endpoint](https://gitlab.com/gitlab-org/gitter/realtime-client/blob/9c11abd8a1206b712272a99aed49c95f1cb10471/lib/realtime-client.js#L21).
1. webapp [initializes a `chats` `LiveCollections`](https://gitlab.com/gitlab-org/gitter/webapp/blob/0a4c1c39acf1efdcaa8f8bd452f15cfe939ff5dc/public/js/collections/chat.js#L96).
1. `ChatCollection` [listens on new messages](https://gitlab.com/gitlab-org/gitter/webapp/blob/c30893e683bef21634f5a084d8b372f88be9165a/public/js/collections/chat.js#L112).
1. `ChatCollection` (wrapped in cache) is [used as the main model for the chat window in `router-chat`](https://gitlab.com/gitlab-org/gitter/webapp/blob/c30893e683bef21634f5a084d8b372f88be9165a/public/js/router-chat.js#L72).
1. webapp [initializes a `chats` `LiveCollections`](https://gitlab.com/gitterHQ/webapp/blob/0a4c1c39acf1efdcaa8f8bd452f15cfe939ff5dc/public/js/collections/chat.js#L96).
1. `ChatCollection` [listens on new messages](https://gitlab.com/gitterHQ/webapp/blob/c30893e683bef21634f5a084d8b372f88be9165a/public/js/collections/chat.js#L112).
1. `ChatCollection` (wrapped in cache) is [used as the main model for the chat window in `router-chat`](https://gitlab.com/gitterHQ/webapp/blob/c30893e683bef21634f5a084d8b372f88be9165a/public/js/router-chat.js#L72).
## UI displaying a new message
- The `ChatCollection` extends `realtime-client.LiveCollection` which in turn [extends `Backbone.Collection`](https://gitlab.com/gitlab-org/gitter/realtime-client/blob/9c11abd8a1206b712272a99aed49c95f1cb10471/lib/live-collection.js#L17).
- `ChatCollectionView` is responsible for rendering the chat messages feed. [It extends Marionette.CollectionView](https://gitlab.com/gitlab-org/gitter/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/chatCollectionView.js#L115) which [connects to the `Backbone.Collection` life cycle](https://marionettejs.com/docs/marionette.collectionview.html#marionettecollectionview).
- [`ChatCollectionView` specifies `ChatItemView` as a view for one message](https://gitlab.com/gitlab-org/gitter/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/chatCollectionView.js#L135).
- [`ChatItemView`](https://gitlab.com/gitlab-org/gitter/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/chatItemView.js) is a juicy view that supports all use cases of one displayed message.
- You can find the template for `ChatItemView` in [`chatItemView.hbs`](https://gitlab.com/gitlab-org/gitter/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/tmpl/chatItemView.hbs).
- `ChatCollectionView` is responsible for rendering the chat messages feed. [It extends Marionette.CollectionView](https://gitlab.com/gitterHQ/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/chatCollectionView.js#L115) which [connects to the `Backbone.Collection` life cycle](https://marionettejs.com/docs/marionette.collectionview.html#marionettecollectionview).
- [`ChatCollectionView` specifies `ChatItemView` as a view for one message](https://gitlab.com/gitterHQ/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/chatCollectionView.js#L135).
- [`ChatItemView`](https://gitlab.com/gitterHQ/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/chatItemView.js) is a juicy view that supports all use cases of one displayed message.
- You can find the template for `ChatItemView` in [`chatItemView.hbs`](https://gitlab.com/gitterHQ/webapp/blob/f20b8a678938c3d0f306c74293eac3621ef513b4/public/js/views/chat/tmpl/chatItemView.hbs).
......@@ -5,7 +5,7 @@ These are scripts that can help you answer questions like "What's this user's ey
## :wrench: Before you can run a script :wrench:
1. [SSH into a box](https://gitlab.com/gl-infra/gitter-infrastructure#ssh-to-boxes) if you are running the script in beta or prod
1. [Setup secrets](https://gitlab.com/gitlab-org/gitter/webapp#configure-service-secrets)
1. [Setup secrets](https://gitlab.com/gitterHQ/webapp#configure-service-secrets)
1. **IMPORTANT:** Adjust the `NODE_ENV=prod` environment variable to the desired environment, `prod`, `beta`, `dev`
......
......@@ -44,7 +44,7 @@ function getBranch() {
}
function getGitlabLink() {
if (commit) return 'https://gitlab.com/gitlab-org/gitter/webapp/commit/' + commit;
if (commit) return 'https://gitlab.com/gitterHQ/webapp/commit/' + commit;
return '';
}
......
......@@ -616,7 +616,7 @@ async function findChatMessagesForTroupe(troupeId, options = {}) {
// limiting the results to 1,500 messages because the page becomes unusable with larger number
// in the future this limiting should be solved by archive pagination
// https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2536
// https://gitlab.com/gitterHQ/webapp/-/issues/2536
const ARCHIVE_MESSAGE_LIMIT = 1500;
function logWarningForLargeArchive(troupeId, startDate, endDate) {
......
......@@ -48,7 +48,7 @@ function ravenClientFactory(options) {
// Halley spam, see https://github.com/troupe/gitter-webapp/issues/1056
'TransportError',
'BayeuxError',
// Elasticsearch, see https://gitlab.com/gitlab-org/gitter/webapp/issues/1950
// Elasticsearch, see https://gitlab.com/gitterHQ/webapp/issues/1950
'NoConnections',
// Random plugins/extensions
'top.GLOBALS',
......
......@@ -70,7 +70,7 @@ describe('gitlab-uri-validator #slow #gitlab', function() {
};
};
const gitlabInfo = await validateGitlabUri(fixture.user1, 'gitlab-org/gitter/webapp');
const gitlabInfo = await validateGitlabUri(fixture.user1, 'gitterHQ/webapp');
assert(gitlabInfo);
assert.strictEqual(gitlabInfo.type, 'PROJECT');
assert.strictEqual(gitlabInfo.uri, 'gitter-integration-tests-group/public-project1');
......
......@@ -247,7 +247,7 @@ describe('ensure-access-and-fetch-descriptor #slow', function() {
assert.rejects(
ensureAccessAndFetchDescriptor(fixture.userGitlab1, {
type: 'GL_PROJECT',
linkPath: 'gitlab-org/gitter/webapp',
linkPath: 'gitterHQ/webapp',
security: 'PUBLIC'
}),
err => {
......
......@@ -41,7 +41,7 @@ describe('gl-project-policy-evaluator #slow #gitlab', function() {
});
it('non-project members should not have access ', function() {
return expect(fixture.userGitlab1, 'gitlab-org/gitter/webapp', {
return expect(fixture.userGitlab1, 'gitterHQ/webapp', {
canRead: false,
canWrite: false,
canJoin: false,
......
......@@ -68,7 +68,7 @@ describe('security-descriptor-write-validator', function() {
const sd = {
type: 'GL_PROJECT',
externalId: '3601513',
linkPath: 'gitlab-org/gitter/webapp',
linkPath: 'gitterHQ/webapp',
public: true,
admins: 'GL_PROJECT_MAINTAINER',
members: 'PUBLIC'
......
......@@ -102,7 +102,7 @@ async function createInvite(room, invitingUser, options) {
};
});
} else {
// See https://gitlab.com/gitlab-org/gitter/webapp/issues/2153
// See https://gitlab.com/gitterHQ/webapp/issues/2153
if (config.get('email:limitInviteEmails')) {
const count = await roomInviteRateLimiter(invitingUser.id, ROOM_INVITE_RATE_LIMIT_EXPIRY);
if (count > ROOM_INVITE_RATE_LIMIT_THRESHOLD) {
......
......@@ -88,7 +88,7 @@ async function notifyInvitedUser(fromUser, invitedUser, room) {
return;
}
// See https://gitlab.com/gitlab-org/gitter/webapp/issues/2153
// See https://gitlab.com/gitterHQ/webapp/issues/2153
if (!config.get('email:limitInviteEmails')) {
await emailNotificationService
.addedToRoomNotification(fromUser, invitedUser, room)
......
......@@ -338,12 +338,12 @@
},
"repository": {
"type": "git",
"url": "git+https://gitlab.com/gitlab-org/gitter/webapp.git"
"url": "git+https://gitlab.com/gitterHQ/webapp.git"
},
"author": "Andrew Newdigate <andrew@gitlab.com> (http://about.me/andrewnewdigate)",
"license": "MIT",
"bugs": {
"url": "https://gitlab.com/gitlab-org/gitter/webapp/issues"
"url": "https://gitlab.com/gitterHQ/webapp/issues"
},
"homepage": "https://gitlab.com/gitlab-org/gitter/webapp#readme"
"homepage": "https://gitlab.com/gitterHQ/webapp#readme"
}
......@@ -285,7 +285,7 @@ function bindAnchorToIssue(view, issueElement, type, provider, repo, issueNumber
/*
This is temporary workaround for incorrectly parsed repo attributes (fixes decoration of messages already in DB).
Removing the `/-` from the end of parsed repo.
https://gitlab.com/gitlab-org/gitter/webapp/-/issues/2453#temporary-ui-fix-for-malformed-repo-urls
https://gitlab.com/gitterHQ/webapp/-/issues/2453#temporary-ui-fix-for-malformed-repo-urls
We can remove this workaround in about 6 months. The assumption is that 6 months old messages are going to be hidden in history
and failing decoration is no longer a big issue. Benefit of less complexity will outweigh a small bug.
......
<section class="login-view__section">
<p class="login-view__oauth-scope-notes">
You can read our
<a href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/oauth-scopes.md" target="_blank">documentation on OAuth scopes</a>
<a href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/oauth-scopes.md" target="_blank">documentation on OAuth scopes</a>
to see why we request certain OAuth scopes.
</p>
......
......@@ -92,19 +92,19 @@ function getProfileCollection() {
result.add({
name: 'Contribute to Gitter',
stub: 'https://gitlab.com/gitlab-org/gitter/webapp',
stub: 'https://gitlab.com/gitterHQ/webapp',
target: '_blank'
});
result.add({
name: 'Help (Documentation)',
stub: 'https://gitlab.com/gitlab-org/gitter/webapp/tree/develop/docs#documentation',
stub: 'https://gitlab.com/gitterHQ/webapp/tree/develop/docs#documentation',
target: '_blank'
});
result.add({
name: "What's new?",
stub: 'https://gitlab.com/gitlab-org/gitter/webapp/blob/develop/CHANGELOG.md',
stub: 'https://gitlab.com/gitterHQ/webapp/blob/develop/CHANGELOG.md',
target: '_blank'
});
......
......@@ -76,7 +76,7 @@ export default {
If you are missing some orgs, you will need to manually grant access on a per-org basis.
See
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/blob/develop/docs/faq.md#why-isnt-my-github-organisation-or-repos-appearing"
href="https://gitlab.com/gitterHQ/webapp/blob/develop/docs/faq.md#why-isnt-my-github-organisation-or-repos-appearing"
target="_blank"
>this article</a
>
......
......@@ -134,7 +134,7 @@ describe('create community store', () => {
});
it('gitlabProjects', () => {
const gitlabProject1 = createRepoGitlabProjectFixture('gitlab-org/gitter/webapp');
const gitlabProject1 = createRepoGitlabProjectFixture('gitterHQ/webapp');
const gitlabProject2 = createRepoGitlabProjectFixture('gitlab-org/gitlab');
const state = {
repos: [
......
......@@ -29,7 +29,7 @@ exports[`CreateRoom matches snapshot 1`] = `
class="create-room-intro-text"
>
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/rooms.md"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/rooms.md"
target="_blank"
>
Gitter rooms
......@@ -38,7 +38,7 @@ exports[`CreateRoom matches snapshot 1`] = `
exist inside of
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/communities.md"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/communities.md"
target="_blank"
>
communities
......@@ -138,7 +138,7 @@ exports[`CreateRoom room submit error matches snapshot 1`] = `
class="create-room-intro-text"
>
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/rooms.md"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/rooms.md"
target="_blank"
>
Gitter rooms
......@@ -147,7 +147,7 @@ exports[`CreateRoom room submit error matches snapshot 1`] = `
exist inside of
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/communities.md"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/communities.md"
target="_blank"
>
communities
......@@ -253,7 +253,7 @@ exports[`CreateRoom room submit loading matches snapshot 1`] = `
class="create-room-intro-text"
>
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/rooms.md"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/rooms.md"
target="_blank"
>
Gitter rooms
......@@ -262,7 +262,7 @@ exports[`CreateRoom room submit loading matches snapshot 1`] = `
exist inside of
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/communities.md"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/communities.md"
target="_blank"
>
communities
......
......@@ -34,7 +34,7 @@ exports[`RepoSelectSection GitHub user no private repo scope 1`] = `
documentation section on
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/faq.md#why-isnt-my-github-organisation-or-repos-appearing"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/faq.md#why-isnt-my-github-organisation-or-repos-appearing"
target="_blank"
>
"Why isn't my GitHub organisation or repos appearing?"
......@@ -73,7 +73,7 @@ exports[`RepoSelectSection GitHub user with private repo scope granted 1`] = `
section on
<a
href="https://gitlab.com/gitlab-org/gitter/webapp/-/blob/develop/docs/faq.md#why-isnt-my-github-organisation-or-repos-appearing"
href="https://gitlab.com/gitterHQ/webapp/-/blob/develop/docs/faq.md#why-isnt-my-github-organisation-or-repos-appearing"
target="_blank"
>
"Why isn't my GitHub organisation or repos appearing?"
......