From 0689663487c66d21aa83da0830bc2c042f89e6e8 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Thu, 21 Jan 2016 18:19:18 +0100 Subject: Use branch_count in Repository#has_visible_content? Gitlab::Git::Repository#branch_count is a tad faster than the previous setup. See gitlab-org/gitlab_git!62 for more information. --- app/models/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/models/repository.rb b/app/models/repository.rb index d9ff71c01ed..f89a3890a49 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -57,7 +57,7 @@ class Repository # This method return true if repository contains some content visible in project page. # def has_visible_content? - !raw_repository.branches.empty? + raw_repository.branch_count > 0 end def commit(id = 'HEAD') -- cgit v1.2.1 From a7c4d0da8c7a340efd7b92718cd0f9436f2ec56f Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sat, 23 Jan 2016 16:08:15 -0800 Subject: Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 --- app/controllers/groups_controller.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index fb26a4e6fc3..f7c9e619755 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -2,17 +2,18 @@ class GroupsController < Groups::ApplicationController include IssuesAction include MergeRequestsAction - skip_before_action :authenticate_user!, only: [:show, :issues, :merge_requests] respond_to :html - before_action :group, except: [:new, :create] + + skip_before_action :authenticate_user!, only: [:index, :show, :issues, :merge_requests] + before_action :group, except: [:index, :new, :create] # Authorize - before_action :authorize_read_group!, except: [:show, :new, :create, :autocomplete] + before_action :authorize_read_group!, except: [:index, :show, :new, :create, :autocomplete] before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects] before_action :authorize_create_group!, only: [:new, :create] # Load group projects - before_action :load_projects, except: [:new, :create, :projects, :edit, :update, :autocomplete] + before_action :load_projects, except: [:index, :new, :create, :projects, :edit, :update, :autocomplete] before_action :event_filter, only: :show layout :determine_layout -- cgit v1.2.1 From 2e911721d2d288a4b2015a55dedd19b2313a452f Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Sun, 24 Jan 2016 15:06:46 -0800 Subject: Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 --- app/helpers/labels_helper.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index a2c3d4d2f32..92eac0560bd 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -83,7 +83,11 @@ module LabelsHelper end def text_color_for_bg(bg_color) - r, g, b = bg_color.slice(1,7).scan(/.{2}/).map(&:hex) + if bg_color.length == 4 + r, g, b = bg_color[1, 4].scan(/./).map { |v| (v * 2).hex } + else + r, g, b = bg_color[1, 7].scan(/.{2}/).map(&:hex) + end if (r + g + b) > 500 '#333333' -- cgit v1.2.1 From d3f24a22219c1706ff580cd00ad9fa519d40a9c9 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Thu, 21 Jan 2016 21:18:03 -0500 Subject: Adds base64 background search icon. All inputs of type `search` will have the gray background and search icon centered. Because the search magnifier is a bg image, I had to hide it with `[value=""]`. I added a little javascript to make sure each input always has it's own value. --- app/assets/javascripts/application.js.coffee | 9 +++++++ app/assets/stylesheets/framework/forms.scss | 33 +++++++++++++++++++++++- app/assets/stylesheets/framework/header.scss | 6 ----- app/assets/stylesheets/pages/issues.scss | 5 ---- app/helpers/application_helper.rb | 2 +- app/views/shared/issuable/_search_form.html.haml | 2 +- 6 files changed, 43 insertions(+), 14 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index eb18d32b25c..48c9890cfb5 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -203,4 +203,13 @@ $ -> form = btn.closest("form") new ConfirmDangerModal(form, text) + $('input[type="search"]').each -> + $this = $(this) + $this.attr 'value', $this.val() + return + + $(document).on 'keyup', 'input[type="search"]' , (e) -> + $this = $(this) + $this.attr 'value', $this.val() + new Aside() diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 4dab806d50e..685dfa21ea5 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -2,13 +2,43 @@ textarea { resize: vertical; } +input { + border-radius: 3px; +} + +input[type='search'], input[type='search'].search-text-input { - background-image: image-url("icon-search.png"); background-repeat: no-repeat; background-position: 10px; + background-size: 16px; + background-position-x: 30%; padding-left: 25px; + background-color: $gray-light; + + &[value=""] { + background-image: url('data:image/png;base64,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 +'); + } + + &::-webkit-input-placeholder { + text-align: center; + } + + &:-moz-placeholder { /* Firefox 18- */ + text-align: center; + } + + &::-moz-placeholder { /* Firefox 19+ */ + text-align: center; + } + + &:-ms-input-placeholder { + text-align: center; + } } + + input[type='text'].danger { background: #F2DEDE!important; border-color: #D66; @@ -74,6 +104,7 @@ label { .form-control { @include box-shadow(none); + border-radius: 3px; } .form-control-inline { diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index ba5e72c8c5a..f875b1460e7 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -108,16 +108,10 @@ header { .search-input { width: 220px; - background-image: image-url("icon-search.png"); - background-repeat: no-repeat; - background-position: 195px; - @include input-big; &:focus { @include box-shadow(none); outline: none; - border-color: #DDD; - background-color: #FFF; } } } diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index ad92cc22815..dd6a251f811 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -49,11 +49,6 @@ .issue-search-form { margin: 0; height: 24px; - - .issue_search { - border: 1px solid #DDD !important; - background-color: #f4f4f4; - } } form.edit-issue { diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f3a2723ee0d..a2458ad3be0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -171,7 +171,7 @@ module ApplicationHelper def search_placeholder if @project && @project.persisted? - 'Search in this project' + 'Search' elsif @snippet || @snippets || @show_snippets 'Search snippets' elsif @group && @group.persisted? diff --git a/app/views/shared/issuable/_search_form.html.haml b/app/views/shared/issuable/_search_form.html.haml index 3a5ad00aa91..da1ccf9c963 100644 --- a/app/views/shared/issuable/_search_form.html.haml +++ b/app/views/shared/issuable/_search_form.html.haml @@ -1,6 +1,6 @@ = form_tag(path, method: :get, id: "issue_search_form", class: 'pull-left issue-search-form') do .append-right-10.hidden-xs.hidden-sm - = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input', spellcheck: false } + = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter', class: 'form-control issue_search search-text-input', spellcheck: false } = hidden_field_tag :state, params['state'] = hidden_field_tag :scope, params['scope'] = hidden_field_tag :assignee_id, params['assignee_id'] -- cgit v1.2.1 From 75c93bb20d3bef042926b8896bf24138bb9ce554 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Thu, 21 Jan 2016 21:29:56 -0500 Subject: Make base64 image smaller by 5000 characters. --- app/assets/stylesheets/framework/forms.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 685dfa21ea5..cf8eccdbc40 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -16,8 +16,7 @@ input[type='search'].search-text-input { background-color: $gray-light; &[value=""] { - background-image: url('data:image/png;base64,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 -'); + background-image: url('data:image/png;base64,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'); } &::-webkit-input-placeholder { -- cgit v1.2.1 From dd8e9a28e79ab0b39ee91fd888c5709635546440 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Thu, 21 Jan 2016 21:32:55 -0500 Subject: Removes extra spaces --- app/assets/stylesheets/framework/forms.scss | 2 -- 1 file changed, 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index cf8eccdbc40..f4e9e1515f0 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -36,8 +36,6 @@ input[type='search'].search-text-input { } } - - input[type='text'].danger { background: #F2DEDE!important; border-color: #D66; -- cgit v1.2.1 From c10705c59fa25adf6d7bfb48abf5e60f0b5bbf68 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Fri, 22 Jan 2016 08:15:56 -0500 Subject: Distinguishes between search inputs. Main search input has different styles than secondary search inputs. --- app/assets/stylesheets/framework/forms.scss | 12 ++++++------ app/views/shared/issuable/_search_form.html.haml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index f4e9e1515f0..d4d1d7a700a 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -12,26 +12,26 @@ input[type='search'].search-text-input { background-position: 10px; background-size: 16px; background-position-x: 30%; - padding-left: 25px; + padding-left: 10px; background-color: $gray-light; - &[value=""] { + &.search-input[value=""] { background-image: url('data:image/png;base64,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'); } - &::-webkit-input-placeholder { + &.search-input::-webkit-input-placeholder { text-align: center; } - &:-moz-placeholder { /* Firefox 18- */ + &.search-input:-moz-placeholder { /* Firefox 18- */ text-align: center; } - &::-moz-placeholder { /* Firefox 19+ */ + &.search-input::-moz-placeholder { /* Firefox 19+ */ text-align: center; } - &:-ms-input-placeholder { + &.search-input:-ms-input-placeholder { text-align: center; } } diff --git a/app/views/shared/issuable/_search_form.html.haml b/app/views/shared/issuable/_search_form.html.haml index da1ccf9c963..6672ea79629 100644 --- a/app/views/shared/issuable/_search_form.html.haml +++ b/app/views/shared/issuable/_search_form.html.haml @@ -1,6 +1,6 @@ = form_tag(path, method: :get, id: "issue_search_form", class: 'pull-left issue-search-form') do .append-right-10.hidden-xs.hidden-sm - = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter', class: 'form-control issue_search search-text-input', spellcheck: false } + = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by name ...', class: 'form-control issue_search search-text-input', spellcheck: false } = hidden_field_tag :state, params['state'] = hidden_field_tag :scope, params['scope'] = hidden_field_tag :assignee_id, params['assignee_id'] -- cgit v1.2.1 From a80d55b766d84c488bbfc9b4e0c5330fc618d74e Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Fri, 22 Jan 2016 23:48:15 -0500 Subject: Border radius to vars. Only top search is gray. --- app/assets/stylesheets/framework/forms.scss | 10 +++++++--- app/assets/stylesheets/framework/tw_bootstrap_variables.scss | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index d4d1d7a700a..d097e4d32f7 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -3,11 +3,15 @@ textarea { } input { - border-radius: 3px; + border-radius: $border-radius-base; +} + +input[type='search'] { + background-color: white; + padding-left: 10px; } -input[type='search'], -input[type='search'].search-text-input { +input[type='search'].search-input { background-repeat: no-repeat; background-position: 10px; background-size: 16px; diff --git a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss index 798cd224ad0..33270388e64 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss @@ -22,9 +22,9 @@ $brand-info: $gl-info; $brand-warning: $gl-warning; $brand-danger: $gl-danger; -$border-radius-base: 2px !default; -$border-radius-large: 2px !default; -$border-radius-small: 2px !default; +$border-radius-base: 3px !default; +$border-radius-large: 3px !default; +$border-radius-small: 3px !default; //== Scaffolding -- cgit v1.2.1 From 40d2daed89f598e0b869bdc09bf47d4defe1c5f0 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Mon, 25 Jan 2016 11:42:47 +0100 Subject: Highlight note code and edit preview --- app/assets/javascripts/blob/edit_blob.js.coffee | 1 + app/assets/stylesheets/framework/common.scss | 8 -------- app/assets/stylesheets/framework/highlight.scss | 18 ++---------------- app/assets/stylesheets/framework/tables.scss | 4 ++-- app/assets/stylesheets/framework/typography.scss | 18 ++++++------------ app/assets/stylesheets/highlight/dark.scss | 4 ++-- app/assets/stylesheets/highlight/monokai.scss | 4 ++-- app/assets/stylesheets/highlight/solarized_dark.scss | 8 ++++---- app/assets/stylesheets/highlight/solarized_light.scss | 8 ++++---- app/assets/stylesheets/highlight/white.scss | 4 ++-- app/assets/stylesheets/pages/diff.scss | 5 +---- app/assets/stylesheets/pages/notes.scss | 1 + app/views/projects/blob/_text.html.haml | 8 ++++---- app/views/projects/blob/preview.html.haml | 2 +- app/views/projects/notes/discussions/_diff.html.haml | 2 +- app/views/shared/snippets/_blob.html.haml | 3 +-- 16 files changed, 34 insertions(+), 64 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/blob/edit_blob.js.coffee b/app/assets/javascripts/blob/edit_blob.js.coffee index f6bf836f19f..390e41ed8d4 100644 --- a/app/assets/javascripts/blob/edit_blob.js.coffee +++ b/app/assets/javascripts/blob/edit_blob.js.coffee @@ -32,6 +32,7 @@ class @EditBlob content: editor.getValue() , (response) -> currentPane.empty().append response + currentPane.syntaxHighlight() return else diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 9bc814cfd2d..6ea2219073c 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -311,14 +311,6 @@ table { } } -.wiki .highlight, .note-body .highlight { - margin: 12px 0 12px 0; -} - -.wiki .code { - overflow-x: auto; -} - .footer-links { margin-bottom: 20px; a { diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss index 2e13ee842e0..9854df4c45c 100644 --- a/app/assets/stylesheets/framework/highlight.scss +++ b/app/assets/stylesheets/framework/highlight.scss @@ -17,6 +17,7 @@ overflow-y: hidden; white-space: pre; word-wrap: normal; + border-left: 1px solid; code { font-family: $monospace_font; @@ -25,7 +26,7 @@ padding: 0; .line { - display: inline; + display: inline-block; } } } @@ -53,18 +54,3 @@ } } } - -.note-text .code { - border: none; - box-shadow: none; - background: $background-color; - padding: 1em; - overflow-x: auto; - - code { - font-family: $monospace_font; - white-space: pre; - word-wrap: normal; - padding: 0; - } -} diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index c4e9f467ce4..b5134f44ded 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -33,11 +33,11 @@ table { background-color: $background-color; font-weight: normal; font-size: 15px; - border-bottom: 1px solid $border-color !important; + border-bottom: 1px solid $border-color; } td { - border-color: $table-border-color !important; + border-color: $table-border-color; border-bottom: 1px solid; } } diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index ab4f71af039..4866a17005d 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -87,8 +87,8 @@ } p { - color:#5c5d5e; - margin:6px 0 0 0; + color: #5c5d5e; + margin: 6px 0 0 0; } table { @@ -102,11 +102,10 @@ } pre { - margin: 12px 0 12px 0 !important; - background-color: #f8fafc; - font-size: 13px !important; - color: #5b6169; - line-height: 1.6em !important; + margin: 12px 0 12px 0; + font-size: 13px; + line-height: 1.6em; + overflow-x: auto; @include border-radius(2px); } @@ -204,11 +203,6 @@ h1, h2, h3, h4, h5, h6 { pre { font-family: $monospace_font; - &.dark { - background: #333; - color: $background-color; - } - &.plain-readme { background: none; border: none; diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss index c7f7a5aaf07..41a4579e1bc 100644 --- a/app/assets/stylesheets/highlight/dark.scss +++ b/app/assets/stylesheets/highlight/dark.scss @@ -10,8 +10,8 @@ } // Code itself - pre.code { - border-left: 1px solid #666; + pre.code, .diff-line-num { + border-color: #666; } &, pre.code, .line_holder .line_content { diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss index 516d8aef960..22cee1af39f 100644 --- a/app/assets/stylesheets/highlight/monokai.scss +++ b/app/assets/stylesheets/highlight/monokai.scss @@ -10,8 +10,8 @@ } // Code itself - pre.code { - border-left: 1px solid #555; + pre.code, .diff-line-num { + border-color: #555; } &, pre.code, .line_holder .line_content { diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss index b0aaadd0f7f..0e8f30b4b0b 100644 --- a/app/assets/stylesheets/highlight/solarized_dark.scss +++ b/app/assets/stylesheets/highlight/solarized_dark.scss @@ -10,8 +10,8 @@ } // Code itself - pre.code { - border-left: 1px solid #113b46; + pre.code, .diff-line-num { + border-color: #113b46; } &, pre.code, .line_holder .line_content { @@ -22,11 +22,11 @@ // Diff line .line_holder { .diff-line-num.new, .line_content.new { - @include diff_background(rgba(133, 153, 0, 0.2), rgba(133, 153, 0, 0.3), #808080); + @include diff_background(rgba(133, 153, 0, 0.2), rgba(133, 153, 0, 0.3), #113b46); } .diff-line-num.old, .line_content.old { - @include diff_background(rgba(220, 50, 47, 0.3), rgba(220, 50, 47, 0.3), #808080); + @include diff_background(rgba(220, 50, 47, 0.3), rgba(220, 50, 47, 0.3), #113b46); } .line_content.match { diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss index 1c138572145..08b6c835907 100644 --- a/app/assets/stylesheets/highlight/solarized_light.scss +++ b/app/assets/stylesheets/highlight/solarized_light.scss @@ -10,8 +10,8 @@ } // Code itself - pre.code { - border-left: 1px solid #c5d0d4; + pre.code, .diff-line-num { + border-color: #c5d0d4; } &, pre.code, .line_holder .line_content { @@ -22,11 +22,11 @@ // Diff line .line_holder { .diff-line-num.new, .line_content.new { - @include diff_background(rgba(133, 153, 0, 0.2), rgba(133, 153, 0, 0.3), #FAF3DD); + @include diff_background(rgba(133, 153, 0, 0.2), rgba(133, 153, 0, 0.3), #c5d0d4); } .diff-line-num.old, .line_content.old { - @include diff_background(rgba(220, 50, 47, 0.2), rgba(220, 50, 47, 0.3), #FAF3DD); + @include diff_background(rgba(220, 50, 47, 0.2), rgba(220, 50, 47, 0.3), #c5d0d4); } .line_content.match { diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 8a932e6540e..8a091028a6c 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -10,8 +10,8 @@ } // Code itself - pre.code { - border-left: 1px solid $border-color; + pre.code, .diff-line-num { + border-color: $border-color; } &, pre.code, .line_holder .line_content { diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 5215df04a6e..a7925e79549 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -79,10 +79,8 @@ margin: 0px; padding: 0px; border: none; - background: $background-color; - color: rgba(0, 0, 0, 0.3); padding: 0px 5px; - border-right: 1px solid $border-color; + border-right: 1px solid; text-align: right; min-width: 35px; max-width: 50px; @@ -92,7 +90,6 @@ float: left; width: 35px; font-weight: normal; - color: rgba(0, 0, 0, 0.3); &:hover { text-decoration: underline; } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index f6343e6bb1e..19ead07c06a 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -154,6 +154,7 @@ ul.notes { text-align: center; padding: 10px 0; background: #FFF; + color: $text-color; } &.notes_line2 { text-align: center; diff --git a/app/views/projects/blob/_text.html.haml b/app/views/projects/blob/_text.html.haml index 4429c395aee..906e5ccb360 100644 --- a/app/views/projects/blob/_text.html.haml +++ b/app/views/projects/blob/_text.html.haml @@ -2,8 +2,8 @@ .file-content.wiki = render_markup(blob.name, blob.data) - else - .file-content.code - - unless blob.empty? - = render 'shared/file_highlight', blob: blob - - else + - unless blob.empty? + = render 'shared/file_highlight', blob: blob + - else + .file-content.code .nothing-here-block Empty file diff --git a/app/views/projects/blob/preview.html.haml b/app/views/projects/blob/preview.html.haml index c5a269f334c..541dc96c45f 100644 --- a/app/views/projects/blob/preview.html.haml +++ b/app/views/projects/blob/preview.html.haml @@ -8,7 +8,7 @@ .file-content.wiki = raw render_markup(@blob.name, @content) - else - .file-content.code + .file-content.code.js-syntax-highlight - unless @diff_lines.empty? %table.text-file - @diff_lines.each do |line| diff --git a/app/views/projects/notes/discussions/_diff.html.haml b/app/views/projects/notes/discussions/_diff.html.haml index 92bbaf0961a..820e31ccd61 100644 --- a/app/views/projects/notes/discussions/_diff.html.haml +++ b/app/views/projects/notes/discussions/_diff.html.haml @@ -9,7 +9,7 @@ = diff.new_path - if diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode %span.file-mode= "#{diff.a_mode} → #{diff.b_mode}" - .diff-content + .diff-content.code.js-syntax-highlight %table - note.truncated_diff_lines.each do |line| - type = line.type diff --git a/app/views/shared/snippets/_blob.html.haml b/app/views/shared/snippets/_blob.html.haml index d26a99bb14c..e0e41fc4bea 100644 --- a/app/views/shared/snippets/_blob.html.haml +++ b/app/views/shared/snippets/_blob.html.haml @@ -3,8 +3,7 @@ .file-content.wiki = render_markup(@snippet.file_name, @snippet.data) - else - .file-content.code - = render 'shared/file_highlight', blob: @snippet + = render 'shared/file_highlight', blob: @snippet - else .file-content.code .nothing-here-block Empty file -- cgit v1.2.1 From 1aa82dc4597d5fcdaa0839f804dd688e641cf85c Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Wed, 20 Jan 2016 22:03:20 -0200 Subject: Prioritize previewable over plain README files --- app/models/tree.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/models/tree.rb b/app/models/tree.rb index e0e04d8859f..b28f31cdd6e 100644 --- a/app/models/tree.rb +++ b/app/models/tree.rb @@ -17,12 +17,20 @@ class Tree def readme return @readme if defined?(@readme) - # Take the first previewable readme, or return nil if none is available or - # we can't preview any of them - readme_tree = blobs.find do |blob| - blob.readme? && (previewable?(blob.name) || plain?(blob.name)) + available_readmes = blobs.select(&:readme?) + + previewable_readmes = available_readmes.select do |blob| + previewable?(blob.name) + end + + plain_readmes = available_readmes.select do |blob| + plain?(blob.name) end + # Prioritize previewable over plain readmes + readme_tree = previewable_readmes.first || plain_readmes.first + + # Return if we can't preview any of them if readme_tree.nil? return @readme = nil end -- cgit v1.2.1 From 26e31f5820ff2ccfcf9f84ffe3bdf1d274d13687 Mon Sep 17 00:00:00 2001 From: Jose Torres Date: Wed, 30 Dec 2015 11:13:48 -0600 Subject: Substituted deprecated forum link with project issues link. [ci skip] --- app/views/shared/_promo.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/views/shared/_promo.html.haml b/app/views/shared/_promo.html.haml index 3596aabe309..09edf4000d5 100644 --- a/app/views/shared/_promo.html.haml +++ b/app/views/shared/_promo.html.haml @@ -1,5 +1,5 @@ .gitlab-promo = link_to 'Homepage', promo_url - = link_to "Blog", promo_url + '/blog/' - = link_to "@gitlab", "https://twitter.com/gitlab" - = link_to "Requests", "http://feedback.gitlab.com/" + = link_to 'Blog', promo_url + '/blog/' + = link_to '@gitlab', 'https://twitter.com/gitlab' + = link_to 'Requests', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#feature-proposals' -- cgit v1.2.1 From 46c36e0e01b21f0c2f42bfb366b56d30de43c3f1 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 25 Jan 2016 21:00:23 -0200 Subject: Fixi import redirect loop --- app/controllers/projects/imports_controller.rb | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb index 8d8035ef5ff..07f355c35b1 100644 --- a/app/controllers/projects/imports_controller.rb +++ b/app/controllers/projects/imports_controller.rb @@ -1,8 +1,8 @@ class Projects::ImportsController < Projects::ApplicationController # Authorize before_action :authorize_admin_project! - before_action :require_no_repo, except: :show - before_action :redirect_if_progress, except: :show + before_action :require_no_repo, only: [:new, :create] + before_action :redirect_if_progress, only: [:new, :create] def new end @@ -24,11 +24,11 @@ class Projects::ImportsController < Projects::ApplicationController end def show - if @project.repository_exists? || @project.import_finished? + if @project.import_finished? if continue_params redirect_to continue_params[:to], notice: continue_params[:notice] else - redirect_to project_path(@project), notice: "The project was successfully forked." + redirect_to namespace_project_path(@project.namespace, @project), notice: finished_notice end elsif @project.import_failed? redirect_to new_namespace_project_import_path(@project.namespace, @project) @@ -36,6 +36,7 @@ class Projects::ImportsController < Projects::ApplicationController if continue_params && continue_params[:notice_now] flash.now[:notice] = continue_params[:notice_now] end + # Render end end @@ -44,6 +45,7 @@ class Projects::ImportsController < Projects::ApplicationController def continue_params continue_params = params[:continue] + if continue_params continue_params.permit(:to, :notice, :notice_now) else @@ -51,8 +53,16 @@ class Projects::ImportsController < Projects::ApplicationController end end + def finished_notice + if @project.forked? + 'The project was successfully forked.' + else + 'The project was successfully imported.' + end + end + def require_no_repo - if @project.repository_exists? && !@project.import_in_progress? + if @project.repository_exists? redirect_to(namespace_project_path(@project.namespace, @project)) end end -- cgit v1.2.1 From 6dd88e090e94f7f36fafd3e35c35a2868f89eebe Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Thu, 21 Jan 2016 16:09:32 -0200 Subject: Extract Projects::ImportService service from RepositoryImportWorker --- app/services/projects/import_service.rb | 71 +++++++++++++++++++++++++++++++++ app/workers/repository_import_worker.rb | 46 ++++----------------- 2 files changed, 78 insertions(+), 39 deletions(-) create mode 100644 app/services/projects/import_service.rb (limited to 'app') diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb new file mode 100644 index 00000000000..7a9508ef085 --- /dev/null +++ b/app/services/projects/import_service.rb @@ -0,0 +1,71 @@ +module Projects + class ImportService < BaseService + include Gitlab::ShellAdapter + + class Error < StandardError; end + + ALLOWED_TYPES = [ + 'bitbucket', + 'fogbugz', + 'gitlab', + 'github', + 'google_code' + ] + + def execute + if unknown_url? + # In this case, we only want to import issues, not a repository. + create_repository + else + import_repository + end + + import_data + + success + rescue Error => e + error(e.message) + end + + private + + def create_repository + unless project.create_repository + raise Error, 'The repository could not be created.' + end + end + + def import_repository + begin + gitlab_shell.import_repository(project.path_with_namespace, project.import_url) + rescue Gitlab::Shell::Error => e + raise Error, e.message + end + end + + def import_data + return unless has_importer? + + unless importer.execute + raise Error, 'The remote data could not be imported.' + end + + if project.import_type == 'bitbucket' + Gitlab::BitbucketImport::KeyDeleter.new(project).execute + end + end + + def has_importer? + ALLOWED_TYPES.include?(project.import_type) + end + + def importer + class_name = "Gitlab::#{project.import_type.camelize}Import::Importer" + class_name.constantize.new(project) + end + + def unknown_url? + project.import_url == Project::UNKNOWN_IMPORT_URL + end + end +end diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index d18c0706b30..e295a9ddd14 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -4,52 +4,20 @@ class RepositoryImportWorker sidekiq_options queue: :gitlab_shell - def perform(project_id) - project = Project.find(project_id) + attr_accessor :project, :current_user - if project.import_url == Project::UNKNOWN_IMPORT_URL - # In this case, we only want to import issues, not a repository. - unless project.create_repository - project.update(import_error: "The repository could not be created.") - project.import_fail - return - end - else - begin - gitlab_shell.import_repository(project.path_with_namespace, project.import_url) - rescue Gitlab::Shell::Error => e - project.update(import_error: e.message) - project.import_fail - return - end - end + def perform(project_id) + @project = Project.find(project_id) + @current_user = @project.creator - data_import_result = - case project.import_type - when 'github' - Gitlab::GithubImport::Importer.new(project).execute - when 'gitlab' - Gitlab::GitlabImport::Importer.new(project).execute - when 'bitbucket' - Gitlab::BitbucketImport::Importer.new(project).execute - when 'google_code' - Gitlab::GoogleCodeImport::Importer.new(project).execute - when 'fogbugz' - Gitlab::FogbugzImport::Importer.new(project).execute - else - true - end + result = Projects::ImportService.new(project, current_user).execute - unless data_import_result - project.update(import_error: "The remote issue data could not be imported.") + if result[:status] == :error + project.update(import_error: result[:message]) project.import_fail return end - if project.import_type == 'bitbucket' - Gitlab::BitbucketImport::KeyDeleter.new(project).execute - end - project.import_finish end end -- cgit v1.2.1 From 28aa7158118d73e60a86e8986e499e13197c4069 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Mon, 25 Jan 2016 22:34:34 -0500 Subject: Clicks the edit button instead of opening the dropdown Fixes #2307 --- app/assets/javascripts/shortcuts_issuable.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/shortcuts_issuable.coffee b/app/assets/javascripts/shortcuts_issuable.coffee index bb532194682..f717a753cf8 100644 --- a/app/assets/javascripts/shortcuts_issuable.coffee +++ b/app/assets/javascripts/shortcuts_issuable.coffee @@ -5,11 +5,11 @@ class @ShortcutsIssuable extends ShortcutsNavigation constructor: (isMergeRequest) -> super() Mousetrap.bind('a', -> - $('.js-assignee').select2('open') + $('.block.assignee .edit-link').trigger('click') return false ) Mousetrap.bind('m', -> - $('.js-milestone').select2('open') + $('.block.milestone .edit-link').trigger('click') return false ) Mousetrap.bind('r', => -- cgit v1.2.1 From 5e88d7357f48bec823c27abb0776aa217672d979 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Mon, 25 Jan 2016 23:51:40 -0500 Subject: Placeholder now visible completely. Fixes #2498 --- app/assets/stylesheets/pages/groups.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'app') diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 263993f59a5..fdd86979a36 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -1,5 +1,15 @@ .member-search-form { float: left; + + input[type='search'] { + width: 225px; + vertical-align: bottom; + + @media (max-width: $screen-xs-max) { + width: 100px; + vertical-align: bottom; + } + } } .milestone-row { -- cgit v1.2.1 From 8d397862cd90f39cc70dd775d613635a542ab72c Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Sat, 23 Jan 2016 19:33:18 +0100 Subject: Use generic method to checks if artifacts are available --- app/views/projects/commit_statuses/_commit_status.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml index 1736dccaf3c..2e3c956ddc4 100644 --- a/app/views/projects/commit_statuses/_commit_status.html.haml +++ b/app/views/projects/commit_statuses/_commit_status.html.haml @@ -66,7 +66,7 @@ %td .pull-right - - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts? + - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts_download_url = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do %i.fa.fa-download - if current_user && can?(current_user, :manage_builds, commit_status.project) -- cgit v1.2.1 From 89154880e56c34e94cdd7326c6cfc67bdb256f74 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Tue, 26 Jan 2016 09:45:12 +0100 Subject: Save button on app settings now btn-save --- app/views/admin/application_settings/_form.html.haml | 2 +- app/views/admin/applications/_form.html.haml | 2 +- app/views/admin/groups/_form.html.haml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index c4020c8273b..dde35f8742a 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -268,4 +268,4 @@ = f.text_field :sentry_dsn, class: 'form-control' .form-actions - = f.submit 'Save', class: 'btn btn-primary' + = f.submit 'Save', class: 'btn btn-save' diff --git a/app/views/admin/applications/_form.html.haml b/app/views/admin/applications/_form.html.haml index fa4e6335c73..e18f7b499dd 100644 --- a/app/views/admin/applications/_form.html.haml +++ b/app/views/admin/applications/_form.html.haml @@ -22,5 +22,5 @@ %code= Doorkeeper.configuration.native_redirect_uri for local tests .form-actions - = f.submit 'Submit', class: "btn btn-primary wide" + = f.submit 'Submit', class: "btn btn-save wide" = link_to "Cancel", admin_applications_path, class: "btn btn-default" diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 8de2ba74a79..198026a1f75 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -21,6 +21,5 @@ - else .form-actions - = f.submit 'Save changes', class: "btn btn-primary" + = f.submit 'Save changes', class: "btn btn-save" = link_to 'Cancel', admin_group_path(@group), class: "btn btn-cancel" - -- cgit v1.2.1 From c0403234193dcb2033bd57160bb0ab6893bb8d77 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Thu, 21 Jan 2016 16:53:34 -0200 Subject: Move Gitlab::BitbucketImport::KeyDeleter to it's own importer --- app/services/projects/import_service.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app') diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index 7a9508ef085..2015897dd19 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -49,10 +49,6 @@ module Projects unless importer.execute raise Error, 'The remote data could not be imported.' end - - if project.import_type == 'bitbucket' - Gitlab::BitbucketImport::KeyDeleter.new(project).execute - end end def has_importer? -- cgit v1.2.1 From a14089485ff697d58dddb61e6da2d1b6c64a803e Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Tue, 26 Jan 2016 08:45:18 -0500 Subject: Styles for file list change. New download btn WIP. --- app/assets/stylesheets/framework/buttons.scss | 4 ++ app/assets/stylesheets/pages/tree.scss | 6 +++ .../repositories/_download_archive.html.haml | 60 +++++++++------------- app/views/projects/tree/show.html.haml | 3 +- 4 files changed, 36 insertions(+), 37 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index c99292c3f83..64854a67678 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -191,3 +191,7 @@ @include btn-green } } + +.btn-icon { + +} \ No newline at end of file diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 6a6dd7dfc85..4ff549ade1f 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -14,9 +14,15 @@ .tree-table { margin-bottom: 0; + tr:nth-child(odd) { + background-color: #F7F9FB; + } + tr { > td, > th { line-height: 26px; + border-top: 1px solid #EEF0F2; + border-bottom: 1px solid #EEF0F2; } &:hover { diff --git a/app/views/projects/repositories/_download_archive.html.haml b/app/views/projects/repositories/_download_archive.html.haml index b9486a9b492..fb4250be901 100644 --- a/app/views/projects/repositories/_download_archive.html.haml +++ b/app/views/projects/repositories/_download_archive.html.haml @@ -1,37 +1,27 @@ - ref = ref || nil - btn_class = btn_class || '' -- split_button = split_button || false -- if split_button == true - %span.btn-group{class: btn_class} - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn col-xs-10', rel: 'nofollow' do - %i.fa.fa-download - %span Download zip - %a.col-xs-2.btn.dropdown-toggle{ 'data-toggle' => 'dropdown' } - %span.caret - %span.sr-only - Select Archive Format - %ul.col-xs-10.dropdown-menu{ role: 'menu' } - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do - %i.fa.fa-download - %span Download zip - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do - %i.fa.fa-download - %span Download tar.gz - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do - %i.fa.fa-download - %span Download tar.bz2 - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do - %i.fa.fa-download - %span Download tar -- else - %span.btn-group{class: btn_class} - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do - %i.fa.fa-download - %span zip - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), class: 'btn', rel: 'nofollow' do - %i.fa.fa-download - %span tar.gz + +.btn-group + %button.btn.dropdown-toggle{ 'data-toggle' => 'dropdown', class: btn_class } + =icon('download') + Download + %span.caret + %span.sr-only + Select Archive Format + %ul.col-xs-10.dropdown-menu{ role: 'menu' } + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do + %i.fa.fa-download + %span Download zip + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do + %i.fa.fa-download + %span Download tar.gz + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do + %i.fa.fa-download + %span Download tar.bz2 + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do + %i.fa.fa-download + %span Download tar \ No newline at end of file diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml index 91fb2a44594..3e9256f6d5f 100644 --- a/app/views/projects/tree/show.html.haml +++ b/app/views/projects/tree/show.html.haml @@ -6,9 +6,8 @@ = render 'projects/last_push' .tree-controls - = render 'projects/find_file_link' - if can? current_user, :download_code, @project - = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped', split_button: true + = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped btn-success' #tree-holder.tree-holder.clearfix .nav-block -- cgit v1.2.1 From c10296f92d581f54cbd32c156806ad72eddcab77 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Tue, 26 Jan 2016 09:36:13 +0100 Subject: Fix visibility level texts on application settings Introduced by me through !2005 --- app/views/admin/application_settings/_form.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index dde35f8742a..baadca09518 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -14,11 +14,11 @@ .form-group.project-visibility-level-holder = f.label :default_project_visibility, class: 'control-label col-sm-2' .col-sm-10 - = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project) + = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new) .form-group.project-visibility-level-holder = f.label :default_snippet_visibility, class: 'control-label col-sm-2' .col-sm-10 - = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: PersonalSnippet) + = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new) .form-group = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' .col-sm-10 -- cgit v1.2.1 From 111834883d287c89a24ae395900786d771214bdb Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Tue, 26 Jan 2016 11:20:18 -0500 Subject: Adjusts styles of table tree Fixes #12725 --- app/assets/stylesheets/framework/buttons.scss | 7 +++-- app/assets/stylesheets/pages/tree.scss | 37 ++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 64854a67678..0e67e35b606 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -127,6 +127,9 @@ &.btn-xs { margin-right: 3px; } + i { + font-size: 11px; + } } &.disabled { pointer-events: auto !important; @@ -190,8 +193,4 @@ .btn-green { @include btn-green } -} - -.btn-icon { - } \ No newline at end of file diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 4ff549ade1f..ab12f2d55e0 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -1,6 +1,12 @@ .tree-holder { > .nav-block { - margin: 11px 0; + margin: 22px 0 0 0; + background: #F8FAFC; + padding: 9px 9px 4px 14px; + border: 1px solid #EBECF0; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + border-bottom-width: 0; } .file-finder { @@ -13,7 +19,18 @@ .tree-table { margin-bottom: 0; - + border: 1px solid #EEF0F2; + thead { + th { + background-color: white; + + &:last-child { + .light { + color: #8C9AAC; + } + } + } + } tr:nth-child(odd) { background-color: #F7F9FB; } @@ -28,8 +45,6 @@ &:hover { td { background: $hover; - border-top: 1px solid #ADF; - border-bottom: 1px solid #ADF; } cursor: pointer; } @@ -48,10 +63,14 @@ max-width: 320px; vertical-align: middle; - i, a { + a { color: $gl-link-color; } + i { + color: #797B7D; + } + img { position: relative; top:-1px; @@ -60,10 +79,16 @@ .tree_commit { max-width: 320px; + a { + color: #8C9AAC; + } } .tree_time_ago { min-width: 135px; + time { + color: #8C9AAC; + } } } @@ -129,5 +154,5 @@ .tree-controls { float: right; - margin-top: 11px; + margin: 32px 7px 0 0; } -- cgit v1.2.1 From 9a1ec97fc47c7d621d3b3332a21c9c9be589ab79 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Tue, 26 Jan 2016 11:52:09 -0500 Subject: Revert "Adjusts styles of table tree" This reverts commit 111834883d287c89a24ae395900786d771214bdb. --- app/assets/stylesheets/framework/buttons.scss | 7 ++--- app/assets/stylesheets/pages/tree.scss | 37 +++++---------------------- 2 files changed, 10 insertions(+), 34 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 0e67e35b606..64854a67678 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -127,9 +127,6 @@ &.btn-xs { margin-right: 3px; } - i { - font-size: 11px; - } } &.disabled { pointer-events: auto !important; @@ -193,4 +190,8 @@ .btn-green { @include btn-green } +} + +.btn-icon { + } \ No newline at end of file diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index ab12f2d55e0..4ff549ade1f 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -1,12 +1,6 @@ .tree-holder { > .nav-block { - margin: 22px 0 0 0; - background: #F8FAFC; - padding: 9px 9px 4px 14px; - border: 1px solid #EBECF0; - border-top-left-radius: 3px; - border-top-right-radius: 3px; - border-bottom-width: 0; + margin: 11px 0; } .file-finder { @@ -19,18 +13,7 @@ .tree-table { margin-bottom: 0; - border: 1px solid #EEF0F2; - thead { - th { - background-color: white; - - &:last-child { - .light { - color: #8C9AAC; - } - } - } - } + tr:nth-child(odd) { background-color: #F7F9FB; } @@ -45,6 +28,8 @@ &:hover { td { background: $hover; + border-top: 1px solid #ADF; + border-bottom: 1px solid #ADF; } cursor: pointer; } @@ -63,14 +48,10 @@ max-width: 320px; vertical-align: middle; - a { + i, a { color: $gl-link-color; } - i { - color: #797B7D; - } - img { position: relative; top:-1px; @@ -79,16 +60,10 @@ .tree_commit { max-width: 320px; - a { - color: #8C9AAC; - } } .tree_time_ago { min-width: 135px; - time { - color: #8C9AAC; - } } } @@ -154,5 +129,5 @@ .tree-controls { float: right; - margin: 32px 7px 0 0; + margin-top: 11px; } -- cgit v1.2.1 From 2b98b7faa10d235734d53c15e1c6f47c88db871f Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Tue, 26 Jan 2016 11:52:30 -0500 Subject: Revert "Styles for file list change." This reverts commit a14089485ff697d58dddb61e6da2d1b6c64a803e. --- app/assets/stylesheets/framework/buttons.scss | 4 -- app/assets/stylesheets/pages/tree.scss | 6 --- .../repositories/_download_archive.html.haml | 60 +++++++++++++--------- app/views/projects/tree/show.html.haml | 3 +- 4 files changed, 37 insertions(+), 36 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 64854a67678..c99292c3f83 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -191,7 +191,3 @@ @include btn-green } } - -.btn-icon { - -} \ No newline at end of file diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 4ff549ade1f..6a6dd7dfc85 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -14,15 +14,9 @@ .tree-table { margin-bottom: 0; - tr:nth-child(odd) { - background-color: #F7F9FB; - } - tr { > td, > th { line-height: 26px; - border-top: 1px solid #EEF0F2; - border-bottom: 1px solid #EEF0F2; } &:hover { diff --git a/app/views/projects/repositories/_download_archive.html.haml b/app/views/projects/repositories/_download_archive.html.haml index fb4250be901..b9486a9b492 100644 --- a/app/views/projects/repositories/_download_archive.html.haml +++ b/app/views/projects/repositories/_download_archive.html.haml @@ -1,27 +1,37 @@ - ref = ref || nil - btn_class = btn_class || '' - -.btn-group - %button.btn.dropdown-toggle{ 'data-toggle' => 'dropdown', class: btn_class } - =icon('download') - Download - %span.caret - %span.sr-only - Select Archive Format - %ul.col-xs-10.dropdown-menu{ role: 'menu' } - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do - %i.fa.fa-download - %span Download zip - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do - %i.fa.fa-download - %span Download tar.gz - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do - %i.fa.fa-download - %span Download tar.bz2 - %li - = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do - %i.fa.fa-download - %span Download tar \ No newline at end of file +- split_button = split_button || false +- if split_button == true + %span.btn-group{class: btn_class} + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn col-xs-10', rel: 'nofollow' do + %i.fa.fa-download + %span Download zip + %a.col-xs-2.btn.dropdown-toggle{ 'data-toggle' => 'dropdown' } + %span.caret + %span.sr-only + Select Archive Format + %ul.col-xs-10.dropdown-menu{ role: 'menu' } + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), rel: 'nofollow' do + %i.fa.fa-download + %span Download zip + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), rel: 'nofollow' do + %i.fa.fa-download + %span Download tar.gz + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.bz2'), rel: 'nofollow' do + %i.fa.fa-download + %span Download tar.bz2 + %li + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar'), rel: 'nofollow' do + %i.fa.fa-download + %span Download tar +- else + %span.btn-group{class: btn_class} + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'zip'), class: 'btn', rel: 'nofollow' do + %i.fa.fa-download + %span zip + = link_to archive_namespace_project_repository_path(@project.namespace, @project, ref: ref, format: 'tar.gz'), class: 'btn', rel: 'nofollow' do + %i.fa.fa-download + %span tar.gz diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml index 3e9256f6d5f..91fb2a44594 100644 --- a/app/views/projects/tree/show.html.haml +++ b/app/views/projects/tree/show.html.haml @@ -6,8 +6,9 @@ = render 'projects/last_push' .tree-controls + = render 'projects/find_file_link' - if can? current_user, :download_code, @project - = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped btn-success' + = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'hidden-xs hidden-sm btn-grouped', split_button: true #tree-holder.tree-holder.clearfix .nav-block -- cgit v1.2.1 From dd60590a3c90d5d12c4aba8a78338da5dd85310f Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Tue, 26 Jan 2016 11:54:31 -0500 Subject: Fix border color. Uses `$border-color` --- app/assets/stylesheets/pages/tree.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 6a6dd7dfc85..11e6d67a082 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -17,6 +17,7 @@ tr { > td, > th { line-height: 26px; + border-bottom: 1px solid $border-color; } &:hover { -- cgit v1.2.1 From 2cc20853c97b48b9353fae2bdb0c1f51d73bb33c Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Tue, 26 Jan 2016 14:40:52 -0500 Subject: adds border color to tables globally. --- app/assets/stylesheets/framework/tables.scss | 2 +- app/assets/stylesheets/pages/tree.scss | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss index b5134f44ded..75b770ae5a2 100644 --- a/app/assets/stylesheets/framework/tables.scss +++ b/app/assets/stylesheets/framework/tables.scss @@ -38,7 +38,7 @@ table { td { border-color: $table-border-color; - border-bottom: 1px solid; + border-bottom: 1px solid $border-color; } } } diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 11e6d67a082..c7411617cb3 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -17,14 +17,11 @@ tr { > td, > th { line-height: 26px; - border-bottom: 1px solid $border-color; } &:hover { td { background: $hover; - border-top: 1px solid #ADF; - border-bottom: 1px solid #ADF; } cursor: pointer; } -- cgit v1.2.1 From a98bf00ca6be419ba3406dcce0d78d23b297d006 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Tue, 26 Jan 2016 14:51:55 -0500 Subject: Adds margin top to readme holder so not flush. --- app/assets/stylesheets/framework/files.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index a4791cf6b34..00cb756b376 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -7,6 +7,7 @@ border: 1px solid $border-color; &.readme-holder { + margin-top: 10px; border-bottom: 0; } -- cgit v1.2.1 From 4be65c3231f1bc260134d1c301b24baf87ef1552 Mon Sep 17 00:00:00 2001 From: Blake Hitchcock Date: Mon, 25 Jan 2016 11:27:03 -0500 Subject: Update ExternalIssue regex for JIRA integration The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used. --- app/models/external_issue.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/models/external_issue.rb b/app/models/external_issue.rb index 49f6c95e045..2ca79df0a29 100644 --- a/app/models/external_issue.rb +++ b/app/models/external_issue.rb @@ -31,7 +31,7 @@ class ExternalIssue # Pattern used to extract `JIRA-123` issue references from text def self.reference_pattern - %r{(?([A-Z\-]+-)\d+)} + %r{(?\b([A-Z][A-Z0-9_]+-)\d+)} end def to_reference(_from_project = nil) -- cgit v1.2.1