Skip to content

Commit e9b5884

Browse files
committed
Merge branch 'develop' into feature/fga/hilt_app_migration
2 parents d89264f + 0d1382a commit e9b5884

File tree

109 files changed

+1552
-637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1552
-637
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Move new issues onto Issue triage board
2+
3+
on:
4+
issues:
5+
types: [opened]
6+
7+
jobs:
8+
automate-project-columns:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: alex-page/[email protected]
12+
with:
13+
project: Issue triage
14+
column: Incoming
15+
repo-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Move X-Needs-Info into Need info column in the Issue triage board
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
jobs:
8+
Move_Labeled_Issue_On_Project_Board:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: konradpabjan/[email protected]
12+
with:
13+
action-token: ${{ secrets.GITHUB_TOKEN }}
14+
project-url: "https://github.com/vector-im/element-android/projects/4"
15+
column-name: "Need info"
16+
label-name: "X-Needs-Info"

CHANGES.md

Lines changed: 36 additions & 0 deletions

attachment-viewer/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ dependencies {
5353
implementation libs.rx.rxKotlin
5454
implementation libs.rx.rxAndroid
5555

56-
implementation libs.jetbrains.kotlinStdlib
5756
implementation libs.androidx.core
5857
implementation libs.androidx.appCompat
5958
implementation libs.androidx.recyclerview

changelog.d/3890.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/4006.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/4090.feature

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/4106.bugfix

Lines changed: 0 additions & 2 deletions
This file was deleted.

changelog.d/4167.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)