maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:thepracticaldev/dev.to_core

Browse source
This commit is contained in:
Ben Halpern 2018-07-03 19:06:39 -04:00
commit fcac6575d1
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/chat/channelDetails.jsx
View file

@ -101,7 +101,7 @@ export default class ChannelDetails extends Component {
{searchedUsers}
<h2>Pending Invites:</h2>
{pendingInvites}
<div>Channels can have a maximum of 128 members, including outstanding invites. All functionality is early beta. Contact us if you need help with anything or to have any restrictions lifted.</div>
<div style={{marginTop: "10px"}}>All functionality is early beta. Contact us if you need help with anything.</div>
</div>
}
return <div>

6
app/javascript/chat/chat.jsx
View file

@ -452,9 +452,11 @@ export default class Chat extends Component {
}
triggerActiveContent = e => {
e.preventDefault();
e.stopPropagation();
const target = e.target
if (target.dataset.content || (target.href && target.href.startsWith('https://dev.to/'))) {
e.preventDefault();
e.stopPropagation();
}
let newActiveContent = this.state.activeContent
if (target.dataset.content === 'channel-details') {
newActiveContent[this.state.activeChannelId] = {

7
app/models/chat_channel_membership.rb
View file

@ -14,8 +14,9 @@ class ChatChannelMembership < ApplicationRecord
if chat_channel.channel_type == "direct" && chat_channel.slug.split("/").exclude?(user.username)
errors.add(:user_id, "is not allowed in chat")
end
if chat_channel.users.size > 128
errors.add(:base, "too many members in channel")
end
# To be possibly implemented in future
# if chat_channel.users.size > 128
# errors.add(:base, "too many members in channel")
# end
end
end