master-v2 #49
Merged
master-v2 #49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
limit count query size in viewer
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md) - [Commits](rubyzip/rubyzip@v1.2.2...v1.3.0) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](rack/rack@2.0.7...2.0.8) Signed-off-by: dependabot[bot] <support@github.com>
Bump rack from 2.0.7 to 2.0.8
Bump rubyzip from 1.2.2 to 1.3.0
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.11...4.17.13) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](jonschlinkert/mixin-deep@1.3.1...1.3.2) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [lodash-es](https://github.com/lodash/lodash) from 4.17.4 to 4.17.15. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.4...4.17.15) Signed-off-by: dependabot[bot] <support@github.com>
…/lodash-4.17.13 Bump lodash from 4.17.11 to 4.17.13 in /viewer
…/mixin-deep-1.3.2 Bump mixin-deep from 1.3.1 to 1.3.2 in /viewer
Bumps [jquery](https://github.com/jquery/jquery) from 3.2.1 to 3.4.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](jquery/jquery@3.2.1...3.4.0) Signed-off-by: dependabot[bot] <support@github.com>
…/lodash-es-4.17.15 Bump lodash-es from 4.17.4 to 4.17.15 in /viewer
…/jquery-3.4.0 Bump jquery from 3.2.1 to 3.4.0 in /viewer
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](jquery/jquery@3.4.0...3.5.0) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.3 to 0.1.5. - [Release notes](https://github.com/faye/websocket-extensions-ruby/releases) - [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md) - [Commits](faye/websocket-extensions-ruby@0.1.3...0.1.5) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [rack](https://github.com/rack/rack) from 2.0.8 to 2.2.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md) - [Commits](rack/rack@2.0.8...2.2.3) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.0 to 6.5.4. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](indutny/elliptic@v6.4.0...v6.5.4) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.14 to 0.7.28. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Commits](faisalman/ua-parser-js@0.7.14...0.7.28) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.5.0 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](npm/hosted-git-info@v2.5.0...v2.8.9) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.14 to 7.0.36. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@7.0.14...7.0.36) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…r/jquery-3.5.0 Bump jquery from 3.4.0 to 3.5.0 in /viewer
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.13...4.17.21) Signed-off-by: dependabot[bot] <support@github.com>
…extensions-0.1.5 Bump websocket-extensions from 0.1.3 to 0.1.5
Bump rack from 2.0.8 to 2.2.3
Bumps [json](https://github.com/flori/json) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/flori/json/releases) - [Changelog](https://github.com/flori/json/blob/master/CHANGES.md) - [Commits](flori/json@v2.2.0...v2.3.0) Signed-off-by: dependabot[bot] <support@github.com>
Bump json from 2.2.0 to 2.3.0
Even if AWS credentials config values are nil, `$config.has_key? :aws` returns true.
Fix a viewer error that occurs when AWS is not used.
cookie-s
commented
Apr 30, 2023
Comment on lines
45
to
70
| formatText(text) { | ||
| const entity = (str) => { | ||
| return str.replace(/"/g, """) | ||
| .replace(/</g, "<") | ||
| .replace(/>/g, ">"); | ||
| }; | ||
| const channelLink = (id) => { | ||
| const channel = this.getChannel(id); | ||
| return `#${channel && channel.name}`; | ||
| }; | ||
| const userLink = (id) => { | ||
| const user = this.getUser(id); | ||
| return `@${user && user.name}`; | ||
| }; | ||
| const specialCommand = (command) => `@${command}`; | ||
| const uriLink = (uri) => `<a href="${uri}" target="_blank">${uri}</a>`; | ||
| if (text) { | ||
| return text.replace(/<#([0-9A-Za-z]+)>/, (m, id) => channelLink(id)) | ||
| .replace(/<#([0-9A-Za-z]+)\|([0-9A-Za-z]+)>/gi, (m, id) => channelLink(id)) | ||
| .replace(/<@([0-9A-Za-z]+)>/gi, (m, id) => userLink(id)) | ||
| .replace(/<@([0-9A-Za-z]+)\|([0-9A-Za-z]+)>/gi, (m, id) => userLink(id)) | ||
| .replace(/<!(channel|everyone|group)>/gi, (m, command) => specialCommand(command)) | ||
| .replace(/<([a-z0-9]+:\/\/[^>]*)>/gi, (m, uri) => uriLink(entity(uri))); | ||
| } | ||
| return text; | ||
| } |
There was a problem hiding this comment.
tyage/slack-patronにあるんですけど、必要性がよくわかりませんでした。だれも参照してなくない？
別にMergeしてよさそう。というか、renameがめんどくさいのでマージしたい ちなみに、僕個人の意見としては、別にtyage/slack-patronとtsg-ut/slack-patronで同期する必要はないかな～と思っています。それぞれ取り入れたい機能は違うし、別のアプリケーションとみなしてよいのではと |
まあだいぶわかるな わざわざし続ける必要はないし、あんまりお互いのこと考える必要はない じゃあこのPRマージだけします |
|
自分が使わなくなっちゃったこともあってtyage/slack-patronのほう全然触れてなくて申し訳ないんですが、 とはいえTSG内部向けのもの追加するのであれば結局forkで作業したほうが楽ですかね...? |
|
んーforkで作業したほうが楽なのは間違いないですねー |
|
ほなまあ別にこのままでいいか。 |
master-v2: Remove container publish
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ちなみにdevcontainerがなんなのか僕は知りません
歴史的経緯
こちらもtyage/slack-patronとそれなりにそろえておかないと、お互い厄介度が増していくんじゃないかなぁと思ったので、ここらでtyage/slack-patronのmasterを取り込んでおこうかなあと思ったものです。
このPR HEADの作られ方
このPRのHEAD commitは、tyage/slack-patron:master (e07345b) から、branchを切って、tsg-ut/slack-patron:master (f3dbade)をmergeされるcommitにしたものです。
git diffを目で眺めて、一生懸命、良さそうな方を選択しました。選択の方針は、
lib/config.rbが追加され、config情報の指定および取得の仕方が若干変わった。これは取り込む。今後の方針
このPR #49 と #50 が良さそうだった暁には、
master-v2branchにマージmasterbranchをmaster-oldbranchに改名master-v2branchをmasterbranchに改名master-oldbranchの削除というような感じで考えています。
このPRの"Merge"ボタンが押されることはない予定です。GitHubのMergeボタンを押したときどうなるか、わかんなくてこわいので。