diff options
| -rw-r--r-- | app/assets/stylesheets/common.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/common.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 2 | ||||
| -rw-r--r-- | app/helpers/projects_helper.rb | 15 | ||||
| -rw-r--r-- | app/views/notes/_discussion.html.haml | 4 | ||||
| -rw-r--r-- | app/views/notes/_note.html.haml | 2 | ||||
| -rw-r--r-- | doc/install/installation.md | 11 |
7 files changed, 30 insertions, 10 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index dd586de3a56..db077048b6c 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,3 +1,7 @@ +html { + overflow-y: scroll; +} + /** LAYOUT **/ body { diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss index f088766afbd..2b3d14abda8 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/common.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss @@ -60,7 +60,7 @@ > a { padding: 8px 20px; margin-right: 7px; - line-height: 19px; + line-height: 20px; border-color: #EEE; color: #888; border-bottom: 1px solid #ddd; diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 3a1b650664f..a7fadd4f641 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -22,7 +22,7 @@ ul.notes { .note-last-update { font-style: italic; } - .note-author { + .author { color: $style_color; font-weight: bold; &:hover { diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index f7325791579..158925ba6c0 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -20,16 +20,21 @@ module ProjectsHelper end end - def link_to_member(project, author) + def link_to_member(project, author, opts = {}) + default_opts = { avatar: true } + opts = default_opts.merge(opts) + return "(deleted)" unless author + author_html = "" + # Build avatar image tag - avatar = image_tag(gravatar_icon(author.try(:email)), width: 16, class: "lil_av") + author_html << image_tag(gravatar_icon(author.try(:email)), width: 16, class: "lil_av") if opts[:avatar] # Build name span tag - name = content_tag :span, author.name, class: 'author' + author_html << content_tag(:span, sanitize(author.name), class: 'author') - author_html = avatar + name + author_html = author_html.html_safe tm = project.team_member_by_id(author) @@ -37,7 +42,7 @@ module ProjectsHelper link_to author_html, project_team_member_path(project, tm), class: "author_link" else author_html - end + end.html_safe end def tm_path team_member diff --git a/app/views/notes/_discussion.html.haml b/app/views/notes/_discussion.html.haml index 093775f0d88..a9a11fc2d7e 100644 --- a/app/views/notes/_discussion.html.haml +++ b/app/views/notes/_discussion.html.haml @@ -10,7 +10,7 @@ Show discussion = image_tag gravatar_icon(note.author.email), class: "avatar s32" %div - = link_to note.author_name, project_team_member_path(@project, @project.team_member_by_id(note.author)), class: "note-author" + = link_to_member(@project, note.author, avatar: false) - if note.for_merge_request? - if note.diff started a discussion on this merge request diff @@ -30,7 +30,7 @@ %div - last_note = discussion_notes.last last updated by - = link_to last_note.author_name, project_team_member_path(@project, @project.team_member_by_id(last_note.author)), class: "note-author" + = link_to_member(@project, last_note.author, avatar: false) %span.discussion-last-update = time_ago_in_words(last_note.updated_at) ago diff --git a/app/views/notes/_note.html.haml b/app/views/notes/_note.html.haml index dd5d7c1ba8c..9efeb563e0a 100644 --- a/app/views/notes/_note.html.haml +++ b/app/views/notes/_note.html.haml @@ -9,7 +9,7 @@ = link_to project_note_path(@project, note), title: "Remove comment", method: :delete, confirm: 'Are you sure you want to remove comment?', remote: true, class: "danger js-note-delete" do %i.icon-trash.cred = image_tag gravatar_icon(note.author.email), class: "avatar s32" - = link_to note.author_name, project_team_member_path(@project, @project.team_member_by_id(note.author)), class: "note-author" + = link_to_member(@project, note.author, avatar: false) %span.note-last-update = time_ago_in_words(note.updated_at) ago diff --git a/doc/install/installation.md b/doc/install/installation.md index 811f8a45f42..8bfcf5c5d44 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -352,6 +352,17 @@ a different host, you can configure its connection string via the # example production: redis.example.tld:6379 +## Custom SSH Connection + +If you are running SSH on a non-standard port, you must change the gitlab user'S SSH config. + + # Add to /home/gitlab/.ssh/config + host localhost # Give your setup a name (here: override localhost) + user git # Your remote git user + port 2222 # Your port number + hostname 127.0.0.1; # Your server name or IP + +You also need to change the corresponding options (e.g. ssh_user, ssh_host, admin_uri) in the `config\gitlab.yml` file. ## User-contributed Configurations |