Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jellyfin/jellyfin-expo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.0
Choose a base ref
...
head repository: jellyfin/jellyfin-expo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 31,063 additions and 17,165 deletions.
  1. +3 −2 .editorconfig
  2. +112 −11 .eslintrc.json
  3. +3 −0 .gitattributes
  4. +32 −0 .github/ISSUE_TEMPLATE/1-bug_report.md
  5. +13 −0 .github/ISSUE_TEMPLATE/2-feature_request.md
  6. +5 −0 .github/ISSUE_TEMPLATE/config.yml
  7. +23 −0 .github/release.yaml
  8. +54 −0 .github/renovate.json
  9. +17 −0 .github/workflows/automation.yml
  10. +74 −0 .github/workflows/code-quality.yml
  11. +35 −0 .github/workflows/codeql-analysis.yml
  12. +89 −0 .github/workflows/publish-beta.yml
  13. +27 −0 .github/workflows/repo-stale.yaml
  14. +2 −1 .gitignore
  15. +4 −0 .npmrc
  16. +1 −0 .nvmrc
  17. +7 −0 .vscode/extensions.json
  18. +13 −0 .vscode/settings.json
  19. +117 −62 App.js
  20. +4 −0 Gemfile
  21. +222 −0 Gemfile.lock
  22. +17 −8 README.md
  23. +0 −5 __tests__/.eslintrc.json
  24. +14 −0 __tests__/i18n.test.js
  25. +12 −5 app.json
  26. BIN assets/images/icon-transparent.png
  27. BIN assets/images/logo-dark.png
  28. BIN assets/images/logo-light.png
  29. BIN assets/images/logowhite.png
  30. +31 −0 assets/js/ExpoRouterShim.staticjs
  31. +136 −0 assets/js/NativeShell.staticjs
  32. +195 −0 assets/js/plugins/NativeAudioPlayer.staticjs
  33. +167 −0 assets/js/plugins/NativeVideoPlayer.staticjs
  34. +2 −1 babel.config.js
  35. +7 −0 codecov.yml
  36. +25 −9 components/AppInfoFooter.js
  37. +104 −0 components/AudioPlayer.js
  38. +15 −8 components/BrowserListItem.js
  39. +13 −8 components/ButtonListItem.js
  40. +59 −0 components/DownloadListItem.js
  41. +45 −23 components/ErrorView.js
  42. +92 −22 components/NativeShellWebView.js
  43. +10 −7 components/RefreshWebView.js
  44. +90 −63 components/ServerInput.js
  45. +39 −27 components/ServerListItem.js
  46. +39 −13 components/SwitchListItem.js
  47. +29 −0 components/ThemeSwitcher.js
  48. +131 −0 components/VideoPlayer.js
  49. +48 −0 components/__tests__/AppInfoFooter.test.js
  50. +20 −0 components/__tests__/AudioPlayer.test.js
  51. +43 −0 components/__tests__/BrowserListItem.test.js
  52. +32 −0 components/__tests__/ButtonListItem.test.js
  53. +95 −0 components/__tests__/DownloadListItem.test.js
  54. +68 −0 components/__tests__/ErrorView.test.js
  55. +43 −0 components/__tests__/NativeShellWebView.test.js
  56. +24 −0 components/__tests__/RefreshWebView.test.js
  57. +183 −0 components/__tests__/ServerInput.test.js
  58. +60 −0 components/__tests__/ServerListItem.test.js
  59. +69 −0 components/__tests__/SwitchListItem.test.js
  60. +25 −0 components/__tests__/ThemeSwitcher.test.js
  61. +20 −0 components/__tests__/VideoPlayer.test.js
  62. +3 −0 components/__tests__/__snapshots__/AudioPlayer.test.js.snap
  63. +123 −0 components/__tests__/__snapshots__/NativeShellWebView.test.js.snap
  64. +76 −0 components/__tests__/__snapshots__/RefreshWebView.test.js.snap
  65. +869 −0 components/__tests__/__snapshots__/ServerInput.test.js.snap
  66. +3 −0 components/__tests__/__snapshots__/ThemeSwitcher.test.js.snap
  67. +58 −0 components/__tests__/__snapshots__/VideoPlayer.test.js.snap
  68. +8 −19 constants/Colors.js
  69. +8 −15 constants/Links.js
  70. +11 −0 constants/MediaTypes.js
  71. +18 −0 constants/Screens.js
  72. +14 −0 constants/__tests__/Links.test.js
  73. +6 −0 fastlane/Appfile
  74. +56 −0 fastlane/Fastfile
  75. +32 −0 fastlane/README.md
  76. +72 −3 i18n.js
  77. +8 −0 index.js
  78. +30 −0 ios/.gitignore
  79. +11 −0 ios/.xcode.env
  80. +489 −0 ios/Jellyfin.xcodeproj/project.pbxproj
  81. +88 −0 ios/Jellyfin.xcodeproj/xcshareddata/xcschemes/Jellyfin.xcscheme
  82. +10 −0 ios/Jellyfin.xcworkspace/contents.xcworkspacedata
  83. +9 −0 ios/Jellyfin/AppDelegate.h
  84. +166 −0 ios/Jellyfin/AppDelegate.mm
  85. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-20x20@1x.png
  86. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-20x20@2x.png
  87. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-20x20@3x.png
  88. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-29x29@1x.png
  89. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-29x29@2x.png
  90. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-29x29@3x.png
  91. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-40x40@1x.png
  92. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-40x40@2x.png
  93. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-40x40@3x.png
  94. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-60x60@2x.png
  95. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-60x60@3x.png
  96. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-76x76@1x.png
  97. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-76x76@2x.png
  98. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/App-Icon-83.5x83.5@2x.png
  99. +122 −0 ios/Jellyfin/Images.xcassets/AppIcon.appiconset/Contents.json
  100. BIN ios/Jellyfin/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png
  101. +6 −0 ios/Jellyfin/Images.xcassets/Contents.json
  102. +21 −0 ios/Jellyfin/Images.xcassets/SplashScreen.imageset/Contents.json
  103. BIN ios/Jellyfin/Images.xcassets/SplashScreen.imageset/image.png
  104. +21 −0 ios/Jellyfin/Images.xcassets/SplashScreenBackground.imageset/Contents.json
  105. BIN ios/Jellyfin/Images.xcassets/SplashScreenBackground.imageset/image.png
  106. +89 −0 ios/Jellyfin/Info.plist
  107. +10 −0 ios/Jellyfin/Jellyfin.entitlements
  108. +51 −0 ios/Jellyfin/SplashScreen.storyboard
  109. +16 −0 ios/Jellyfin/Supporting/Expo.plist
  110. +10 −0 ios/Jellyfin/main.m
  111. +4 −0 ios/Jellyfin/noop-file.swift
  112. +67 −0 ios/Podfile
  113. +637 −0 ios/Podfile.lock
  114. +3 −0 ios/Podfile.properties.json
  115. +57 −0 jest.setup.js
  116. +59 −22 langs/ar.json
  117. +91 −0 langs/be.json
  118. +92 −0 langs/bg.json
  119. +91 −0 langs/ca.json
  120. +90 −0 langs/ch.json
  121. +27 −4 langs/cs.json
  122. +90 −0 langs/cy.json
  123. +46 −9 langs/da.json
  124. +40 −17 langs/de.json
  125. +91 −0 langs/el.json
  126. +22 −3 langs/en.json
  127. +90 −0 langs/eo.json
  128. +27 −4 langs/es.json
  129. +91 −0 langs/es_419.json
  130. +43 −7 langs/es_AR.json
  131. +91 −0 langs/et.json
  132. +91 −0 langs/fa.json
  133. +90 −0 langs/fi.json
  134. +90 −0 langs/fil.json
  135. +40 −17 langs/fr.json
  136. +90 −0 langs/ga.json
  137. +92 −0 langs/he.json
  138. +91 −0 langs/hr.json
  139. +50 −27 langs/hu.json
  140. +90 −0 langs/hy.json
  141. +90 −0 langs/id.json
  142. +90 −0 langs/is.json
  143. +38 −15 langs/it.json
  144. +50 −28 langs/ja.json
  145. +91 −0 langs/kk.json
  146. +36 −13 langs/ko.json
  147. +90 −0 langs/kw.json
  148. +90 −0 langs/ky.json
  149. +90 −0 langs/lt.json
  150. +90 −0 langs/lv.json
  151. +90 −0 langs/lzh.json
  152. +87 −0 langs/mn.json
  153. +90 −0 langs/ms.json
  154. +90 −0 langs/mt.json
  155. +90 −0 langs/nan.json
  156. +29 −6 langs/nb_NO.json
  157. +90 −0 langs/nds.json
  158. +30 −7 langs/nl.json
  159. +31 −8 langs/pl.json
  160. +91 −0 langs/pt.json
  161. +29 −6 langs/pt_BR.json
  162. +91 −0 langs/pt_PT.json
  163. +27 −4 langs/ro.json
  164. +92 −0 langs/ru.json
  165. +27 −4 langs/sk.json
  166. +30 −7 langs/sl.json
  167. +90 −0 langs/sq.json
  168. +92 −0 langs/sr.json
  169. +32 −9 langs/sv.json
  170. +27 −4 langs/ta.json
  171. +92 −0 langs/tr.json
  172. +91 −0 langs/uk.json
  173. +91 −0 langs/vi.json
  174. +31 −8 langs/zh_Hans.json
  175. +60 −23 langs/zh_Hant.json
  176. +21 −0 metro.config.js
  177. +96 −0 models/DownloadModel.ts
  178. +6 −5 models/ServerModel.js
  179. +48 −0 models/__tests__/DownloadModel.test.js
  180. +86 −0 models/__tests__/ServerModel.test.js
  181. +38 −134 navigation/AppNavigator.js
  182. +41 −0 navigation/HomeNavigator.js
  183. +38 −0 navigation/RootNavigator.js
  184. +41 −0 navigation/SettingsNavigator.js
  185. +101 −0 navigation/TabNavigator.js
  186. +14,497 −0 package-lock.json
  187. +104 −50 package.json
  188. +13 −0 patches/boost1760.patch
  189. +31 −0 patches/xcode15.patch
  190. +67 −21 screens/AddServerScreen.js
  191. +76 −0 screens/DevSettingsScreen.js
  192. +167 −0 screens/DownloadScreen.js
  193. +34 −27 screens/ErrorScreen.js
  194. +163 −87 screens/HomeScreen.js
  195. +3 −3 screens/LoadingScreen.js
  196. +89 −0 screens/ServerHelpScreen.js
  197. +113 −24 screens/SettingsScreen.js
  198. +24 −0 screens/__tests__/AddServerScreen.test.js
  199. +20 −0 screens/__tests__/DevSettingsScreen.test.js
  200. +65 −0 screens/__tests__/DownloadScreen.test.js
  201. +48 −0 screens/__tests__/ErrorScreen.test.js
  202. +106 −0 screens/__tests__/HomeScreen.test.js
  203. +20 −0 screens/__tests__/LoadingScreen.test.js
  204. +24 −0 screens/__tests__/ServerHelpScreen.test.js
  205. +47 −0 screens/__tests__/SettingsScreen.test.js
  206. +216 −0 screens/__tests__/__snapshots__/AddServerScreen.test.js.snap
  207. +418 −0 screens/__tests__/__snapshots__/DevSettingsScreen.test.js.snap
  208. +339 −0 screens/__tests__/__snapshots__/DownloadScreen.test.js.snap
  209. +260 −0 screens/__tests__/__snapshots__/ErrorScreen.test.js.snap
  210. +219 −0 screens/__tests__/__snapshots__/HomeScreen.test.js.snap
  211. +27 −0 screens/__tests__/__snapshots__/LoadingScreen.test.js.snap
  212. +200 −0 screens/__tests__/__snapshots__/ServerHelpScreen.test.js.snap
  213. +727 −0 screens/__tests__/__snapshots__/SettingsScreen.test.js.snap
  214. +61 −0 stores/DownloadStore.ts
  215. +86 −0 stores/MediaStore.js
  216. +55 −3 stores/RootStore.js
  217. +11 −3 stores/ServerStore.js
  218. +74 −5 stores/SettingStore.js
  219. +134 −0 stores/__tests__/DownloadStore.test.js
  220. +60 −0 stores/__tests__/MediaStore.test.js
  221. +63 −0 stores/__tests__/RootStore.test.js
  222. +96 −0 stores/__tests__/ServerStore.test.js
  223. +120 −0 stores/__tests__/SettingStore.test.js
  224. +13 −34 utils/Theme.js → themes/base/elements.js
  225. +38 −0 themes/dark/elements.js
  226. +13 −0 themes/dark/index.js
  227. +19 −0 themes/dark/navigation.js
  228. +4 −3 constants/Storage.js → themes/index.js
  229. +19 −0 themes/light/elements.js
  230. +13 −0 themes/light/index.js
  231. +20 −0 themes/light/navigation.js
  232. +9 −0 tsconfig.json
  233. +21 −0 types/react-native-elements.d.ts
  234. +0 −59 utils/CachingStorage.js
  235. +34 −1 utils/Device.js
  236. +20 −0 utils/Fetch.js
  237. +18 −0 utils/File.ts
  238. +0 −124 utils/JellyfinValidator.js
  239. +0 −140 utils/NativeShell.js
  240. +96 −0 utils/ServerValidator.js
  241. +37 −0 utils/StaticScriptLoader.js
  242. +10 −0 utils/Time.ts
  243. +2 −2 utils/WebBrowser.js
  244. +124 −0 utils/__tests__/Device.test.js
  245. +32 −0 utils/__tests__/Fetch.test.js
  246. +39 −0 utils/__tests__/File.test.js
  247. +25 −0 utils/__tests__/Icons.test.js
  248. +120 −0 utils/__tests__/ServerValidator.test.js
  249. +31 −0 utils/__tests__/StaticScriptLoader.test.js
  250. +28 −0 utils/__tests__/Time.test.js
  251. +60 −0 utils/__tests__/WebBrowser.test.js
  252. +91 −0 utils/profiles/base.js
  253. +149 −0 utils/profiles/ios.js
  254. +180 −0 utils/profiles/ios10.js
  255. +49 −0 utils/profiles/ios12.js
  256. +35 −0 utils/profiles/iosFmp4.js
  257. +0 −15,876 yarn.lock
5 changes: 3 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -4,12 +4,13 @@ root = true
insert_final_newline = true
end_of_line = lf

[{*.js, *.json}]
[{*.js, *.json, *.staticjs}]
charset = utf-8
trim_trailing_whitespace = true

[*.js]
[{*.js, .staticjs}]
indent_style = tab
quote_type = single

[*.json]
indent_style = space
123 changes: 112 additions & 11 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"env": {
"es2020": true,
"node": true
"react-native/react-native": true
},
"extends": [
"eslint:recommended",
@@ -12,11 +11,7 @@
"plugin:import/typescript",
"plugin:eslint-comments/recommended"
],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
@@ -26,34 +21,140 @@
},
"plugins": [
"react",
"react-native",
"promise",
"import",
"eslint-comments"
],
"settings": {
"react": {
"version": "detect"
},
"jest": {
"version": "detect"
}
},
"rules": {
"react/prop-types": ["error"],
"jsx-quotes": ["error", "prefer-single"],

"react-native/no-unused-styles": ["error"],
"react-native/split-platform-components": ["error"],
"react-native/no-color-literals": ["error"],
"react-native/no-raw-text": ["error"],

"import/order": ["error", {
"alphabetize": { "order": "asc", "caseInsensitive": true },
"newlines-between": "always-and-inside-groups"
}],

"array-bracket-spacing": ["error", "always", { "objectsInArrays": false, "arraysInArrays": false }],
"array-callback-return": ["error"],
"arrow-spacing": ["error"],
"block-spacing": ["error"],
"brace-style": ["error"],
"brace-style": ["error", "1tbs", { "allowSingleLine": true }],
"comma-dangle": ["error", "never"],
"comma-spacing": ["error"],
"curly": ["error", "multi-line"],
"default-case-last": ["error"],
"dot-location": ["error", "property"],
"eol-last": ["error"],
"indent": ["error", "tab", { "SwitchCase": 1 }],
"key-spacing": ["error"],
"keyword-spacing": ["error"],
"max-params": ["error", { "max": 7 }],
"max-statements-per-line": ["error"],
"no-duplicate-imports": ["error"],
"no-empty-function": ["error"],
"no-floating-decimal": ["error"],
"no-multi-spaces": ["error"],
"no-multiple-empty-lines": ["error", { "max": 1 }],
"no-nested-ternary": ["error"],
"no-redeclare": ["error"],
"no-return-await": ["error"],
"no-sequences": ["error"],
"no-shadow": ["error"],
"no-throw-literal": ["error"],
"no-trailing-spaces": ["error"],
"no-unreachable": ["error"],
"no-unused-expressions": ["error", { "allowShortCircuit": true, "allowTernary": true, "allowTaggedTemplates": true }],
"no-unused-vars": ["error"],
"no-var": ["error"],
"no-void": ["error"],
"object-curly-spacing": ["error", "always"],
"one-var": ["error", "never"],
"padded-blocks": ["error", "never"],
"prefer-const": ["error", { "destructuring": "all" }],
"quote-props": ["error", "as-needed"],
"quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": false }],
"radix": ["error"],
"semi": ["error"],
"space-before-blocks": ["error"],
"space-infix-ops": ["error"]
}
}
"space-before-function-paren": ["error", { "anonymous": "never", "named": "never", "asyncArrow": "always" }],
"space-in-parens": ["error"],
"space-infix-ops": ["error"],
"yoda": ["error"]
},
"ignorePatterns": [ "coverage" ],
"overrides": [
{
"files": [ "./**/*.js" ],
"globals": {
"AbortController": "readonly",
"URL": "readonly",
"URLSearchParams": "readonly"
}
},
{
"files": [ "jest.setup.js", "./**/*.test.js" ],
"plugins": [ "jest" ],
"env": {
"jest/globals": true
},
"globals": {
"fetch": "readonly"
},
"extends": [
"plugin:jest/recommended",
"plugin:jest/style"
],
"rules": {
"jest/consistent-test-it": ["error"],
"jest/lowercase-name": ["error", { "ignoreTopLevelDescribe": true }],
"jest/require-top-level-describe": ["error"]
}
},
{
"files": [ "./assets/**/*.staticjs" ],
"extends": [
"plugin:compat/recommended"
],
"globals": {
"postExpoEvent": "readonly"
},
"env": {
"react-native/react-native": false,
"browser": true,
"es6": true
}
},
{
"files": [
"./**/*.ts",
"./**/*.tsx"
],
"parser": "@typescript-eslint/parser",
"plugins": [ "@typescript-eslint" ],
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"plugin:promise/recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:eslint-comments/recommended"
]
}
]
}
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
langs/*.json merge=union

# Specify language of .staticjs files for GitHub
*.staticjs linguist-language=JavaScript
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a bug report
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
<!-- A clear and concise description of what the bug is. -->

**System (please complete the following information):**
- iOS Version:
- Jellyfin Expo version:
- Jellyfin Server version:

**To Reproduce**
<!-- Steps to reproduce the behavior: -->
1. Go to '...'
2. Tap on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
<!-- A clear and concise description of what you expected to happen. -->

**Screenshots**
<!-- If applicable, add screenshots to help explain your problem. -->

**Additional context**
<!-- Add any other context about the problem here. -->
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE/2-feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
name: Feature Request
about: Request a new feature
title: ''
labels: feature
assignees: ''
---

**Describe the feature**
<!-- A clear and concise description of what you would like to see. -->

**Additional context**
<!-- Add any other context about the feature here. -->
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Server Access
url: https://jellyfin.org/docs/general/community-standards/servers
about: Unable to access the server?
23 changes: 23 additions & 0 deletions .github/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
changelog:
categories:
- title: ✨ New features
labels:
- feature
- title: 🏗️ Enhancements
labels:
- enhancement
- title: 🐛 Bug fixes
labels:
- bug
- title: 🔧 Additional changes
labels:
- '*'
exclude:
labels:
- bug
- dependencies
- enhancement
- feature
- title: ⬆️ Dependency upgrades
labels:
- dependencies
54 changes: 54 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>jellyfin/.github//renovate-presets/nodejs",
":dependencyDashboard"
],
"ignoreDeps": [
"@babel/core",
"@react-native-async-storage/async-storage",
"@types/react",
"babel-preset-expo",
"expo",
"expo-asset",
"expo-av",
"expo-constants",
"expo-device",
"expo-file-system",
"expo-font",
"expo-keep-awake",
"expo-localization",
"expo-screen-orientation",
"expo-splash-screen",
"expo-status-bar",
"expo-system-ui",
"expo-web-browser",
"jest",
"jest-expo",
"react",
"react-dom",
"react-native",
"react-native-gesture-handler",
"react-native-get-random-values",
"react-native-reanimated",
"react-native-safe-area-context",
"react-native-screens",
"react-native-web",
"react-native-webview",
"typescript"
],
"packageRules": [
{
"matchPackageNames": [ "mobx" ],
"allowedVersions": "<6"
},
{
"matchPackageNames": [ "mobx-react-lite" ],
"allowedVersions": "<3"
},
{
"matchPackageNames": [ "mobx-task" ],
"allowedVersions": "<3"
}
]
}
17 changes: 17 additions & 0 deletions .github/workflows/automation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Automation

on:
push:
branches:
- master
pull_request_target:

jobs:
labeling:
name: Label merge conflicts
runs-on: ubuntu-latest
steps:
- uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
with:
dirtyLabel: 'merge conflict'
repoToken: ${{ secrets.JF_BOT_TOKEN }}
Loading