Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
diaspora
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Milan
diaspora
Commits
7e76c55f
Commit
7e76c55f
authored
Jan 14, 2012
by
Jonne Haß
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:diaspora/diaspora
parents
5d022360
ca763277
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
app/controllers/comments_controller.rb
app/controllers/comments_controller.rb
+5
-0
app/views/comments/new.mobile.haml
app/views/comments/new.mobile.haml
+1
-1
public/stylesheets/sass/mobile.scss
public/stylesheets/sass/mobile.scss
+1
-0
No files found.
app/controllers/comments_controller.rb
View file @
7e76c55f
...
...
@@ -57,6 +57,10 @@ class CommentsController < ApplicationController
end
end
def
new
render
:layout
=>
false
end
def
index
if
user_signed_in?
@post
=
current_user
.
find_visible_shareable_by_id
(
Post
,
params
[
:post_id
])
...
...
@@ -68,6 +72,7 @@ class CommentsController < ApplicationController
@comments
=
@post
.
comments
.
includes
(
:author
=>
:profile
).
order
(
'created_at ASC'
)
respond_with
do
|
format
|
format
.
json
{
render
:json
=>
@post
.
comments
.
as_api_response
(
:backbone
),
:status
=>
200
}
format
.
mobile
{
render
:layout
=>
false
}
end
else
raise
ActiveRecord
::
RecordNotFound
.
new
...
...
app/views/comments/new.mobile.haml
View file @
7e76c55f
=
new_comment_form
(
params
[
:post_id
],
current_user
)
=
render
:partial
=>
'new_comment'
,
:locals
=>
{
:post_id
=>
params
[
:post_id
]}
public/stylesheets/sass/mobile.scss
View file @
7e76c55f
...
...
@@ -248,6 +248,7 @@ body {
.comments
{
overflow
:
auto
;
position
:
relative
;
text-align
:
left
;
*
{
max-width
:
100%
;
}
min-height
:
34px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment