Merge branch 'master' into use-top-area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
commit
088742551d
20 changed files with 53 additions and 59 deletions
|
@ -27,6 +27,7 @@ v 8.5.0 (unreleased)
|
|||
- Mark inline difference between old and new paths when a file is renamed
|
||||
- Support Akismet spam checking for creation of issues via API (Stan Hu)
|
||||
- Improve UI consistency between projects and groups lists
|
||||
- Add sort dropdown to dashboard projects page
|
||||
|
||||
v 8.4.3
|
||||
- Increase lfs_objects size column to 8-byte integer to allow files larger
|
||||
|
|
2
Gemfile
2
Gemfile
|
@ -30,7 +30,7 @@ gem 'omniauth-github', '~> 1.1.1'
|
|||
gem 'omniauth-gitlab', '~> 1.0.0'
|
||||
gem 'omniauth-google-oauth2', '~> 0.2.0'
|
||||
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
|
||||
gem 'omniauth-saml', '~> 1.4.0'
|
||||
gem 'omniauth-saml', '~> 1.4.2'
|
||||
gem 'omniauth-shibboleth', '~> 1.2.0'
|
||||
gem 'omniauth-twitter', '~> 1.2.0'
|
||||
gem 'omniauth_crowd', '~> 2.2.0'
|
||||
|
|
|
@ -532,9 +532,9 @@ GEM
|
|||
omniauth-oauth2 (1.3.1)
|
||||
oauth2 (~> 1.0)
|
||||
omniauth (~> 1.2)
|
||||
omniauth-saml (1.4.1)
|
||||
omniauth-saml (1.4.2)
|
||||
omniauth (~> 1.1)
|
||||
ruby-saml (~> 1.0.0)
|
||||
ruby-saml (~> 1.1, >= 1.1.1)
|
||||
omniauth-shibboleth (1.2.1)
|
||||
omniauth (>= 1.0.0)
|
||||
omniauth-twitter (1.2.1)
|
||||
|
@ -690,7 +690,7 @@ GEM
|
|||
ruby-fogbugz (0.2.1)
|
||||
crack (~> 0.4)
|
||||
ruby-progressbar (1.7.5)
|
||||
ruby-saml (1.0.0)
|
||||
ruby-saml (1.1.1)
|
||||
nokogiri (>= 1.5.10)
|
||||
uuid (~> 2.3)
|
||||
ruby2ruby (2.2.0)
|
||||
|
@ -974,7 +974,7 @@ DEPENDENCIES
|
|||
omniauth-gitlab (~> 1.0.0)
|
||||
omniauth-google-oauth2 (~> 0.2.0)
|
||||
omniauth-kerberos (~> 0.3.0)
|
||||
omniauth-saml (~> 1.4.0)
|
||||
omniauth-saml (~> 1.4.2)
|
||||
omniauth-shibboleth (~> 1.2.0)
|
||||
omniauth-twitter (~> 1.2.0)
|
||||
omniauth_crowd (~> 2.2.0)
|
||||
|
|
|
@ -65,8 +65,7 @@ class @DropzoneInput
|
|||
return
|
||||
|
||||
success: (header, response) ->
|
||||
child = $(dropzone[0]).children("textarea")
|
||||
$(child).val $(child).val() + response.link.markdown + "\n"
|
||||
pasteText response.link.markdown
|
||||
return
|
||||
|
||||
error: (temp, errorMessage) ->
|
||||
|
@ -128,6 +127,7 @@ class @DropzoneInput
|
|||
beforeSelection = $(child).val().substring 0, caretStart
|
||||
afterSelection = $(child).val().substring caretEnd, textEnd
|
||||
$(child).val beforeSelection + text + afterSelection
|
||||
child.get(0).setSelectionRange caretStart + text.length, caretEnd + text.length
|
||||
form_textarea.trigger "input"
|
||||
|
||||
getFilename = (e) ->
|
||||
|
|
|
@ -6,11 +6,3 @@
|
|||
font-size: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.explore-trending-block {
|
||||
.lead {
|
||||
line-height: 32px;
|
||||
font-size: 18px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -415,6 +415,10 @@ pre.light-well {
|
|||
a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
> span {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.project-description {
|
||||
|
|
|
@ -3,6 +3,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
|
|||
|
||||
def index
|
||||
@projects = current_user.authorized_projects.sorted_by_activity.non_archived
|
||||
@projects = @projects.sort(@sort = params[:sort])
|
||||
@projects = @projects.includes(:namespace)
|
||||
@last_push = current_user.recent_push
|
||||
|
||||
|
|
|
@ -10,8 +10,19 @@ module ExploreHelper
|
|||
|
||||
options = exist_opts.merge(options)
|
||||
|
||||
path = explore_projects_path
|
||||
path = if explore_controller?
|
||||
explore_projects_path
|
||||
elsif current_action?(:starred)
|
||||
starred_dashboard_projects_path
|
||||
else
|
||||
dashboard_projects_path
|
||||
end
|
||||
|
||||
path << "?#{options.to_param}"
|
||||
path
|
||||
end
|
||||
|
||||
def explore_controller?
|
||||
controller.class.name.split("::").first == "Explore"
|
||||
end
|
||||
end
|
||||
|
|
|
@ -13,7 +13,8 @@
|
|||
Explore Projects
|
||||
|
||||
.nav-controls
|
||||
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name...', class: 'projects-list-filter form-control hidden-xs', spellcheck: false
|
||||
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name...', class: 'projects-list-filter form-control hidden-xs input-short', spellcheck: false
|
||||
= render 'explore/projects/dropdown'
|
||||
- if current_user.can_create_project?
|
||||
= link_to new_project_path, class: 'btn btn-new' do
|
||||
= icon('plus')
|
||||
|
|
|
@ -16,8 +16,5 @@
|
|||
|
||||
= render 'shared/issuable/filter', type: :issues
|
||||
|
||||
.gray-content-block.second-block
|
||||
List all issues from all projects you have access to.
|
||||
|
||||
.prepend-top-default
|
||||
= render 'shared/issues'
|
||||
|
|
|
@ -7,8 +7,5 @@
|
|||
|
||||
= render 'shared/issuable/filter', type: :merge_requests
|
||||
|
||||
.gray-content-block.second-block
|
||||
List all merge requests from all projects you have access to.
|
||||
|
||||
.prepend-top-default
|
||||
= render 'shared/merge_requests'
|
||||
|
|
|
@ -7,9 +7,6 @@
|
|||
.nav-controls
|
||||
= render 'shared/new_project_item_select', path: 'milestones/new', label: "New Milestone", include_groups: true
|
||||
|
||||
.gray-content-block
|
||||
List all milestones from all projects you have access to.
|
||||
|
||||
.milestones
|
||||
%ul.content-list
|
||||
- if @milestones.blank?
|
||||
|
|
|
@ -3,19 +3,13 @@
|
|||
%span.light
|
||||
- if @sort.present?
|
||||
= sort_options_hash[@sort]
|
||||
- elsif current_page?(trending_explore_projects_path) || current_page?(explore_root_path)
|
||||
Trending projects
|
||||
- elsif current_page?(starred_explore_projects_path)
|
||||
Most stars
|
||||
- else
|
||||
= sort_title_recently_created
|
||||
= sort_title_recently_updated
|
||||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to trending_explore_projects_path do
|
||||
Trending projects
|
||||
= link_to starred_explore_projects_path do
|
||||
Most stars
|
||||
= link_to explore_projects_filter_path(sort: sort_value_name) do
|
||||
= sort_title_name
|
||||
= link_to explore_projects_filter_path(sort: sort_value_recently_created) do
|
||||
= sort_title_recently_created
|
||||
= link_to explore_projects_filter_path(sort: sort_value_oldest_created) do
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
= form_tag explore_projects_filter_path, method: :get, class: 'form-inline form-tiny' do |f|
|
||||
.form-group
|
||||
= search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input", id: "projects_search", spellcheck: false
|
||||
= hidden_field_tag :sort, @sort
|
||||
.form-group
|
||||
= button_tag 'Search', class: "btn"
|
||||
|
||||
|
@ -46,4 +47,3 @@
|
|||
= link_to explore_projects_filter_path(tag: tag.name) do
|
||||
%i.fa.fa-tag
|
||||
= tag.name
|
||||
= render 'explore/projects/dropdown'
|
||||
|
|
10
app/views/explore/projects/_nav.html.haml
Normal file
10
app/views/explore/projects/_nav.html.haml
Normal file
|
@ -0,0 +1,10 @@
|
|||
%ul.nav-links
|
||||
= nav_link(page: [trending_explore_projects_path, explore_root_path]) do
|
||||
= link_to trending_explore_projects_path do
|
||||
Trending
|
||||
= nav_link(page: starred_explore_projects_path) do
|
||||
= link_to starred_explore_projects_path do
|
||||
Most stars
|
||||
= nav_link(page: explore_projects_path) do
|
||||
= link_to explore_projects_path do
|
||||
All
|
|
@ -6,7 +6,11 @@
|
|||
- else
|
||||
= render 'explore/head'
|
||||
|
||||
.gray-content-block.clearfix.second-block
|
||||
.top-area
|
||||
= render 'explore/projects/nav'
|
||||
|
||||
.gray-content-block.second-block.clearfix
|
||||
= render 'filter'
|
||||
|
||||
= render 'projects', projects: @projects
|
||||
= paginate @projects, theme: "gitlab"
|
||||
|
|
|
@ -6,12 +6,6 @@
|
|||
- else
|
||||
= render 'explore/head'
|
||||
|
||||
.explore-trending-block
|
||||
.gray-content-block.second-block
|
||||
.pull-right
|
||||
= render 'explore/projects/dropdown'
|
||||
.oneline
|
||||
%i.fa.fa-star
|
||||
See most starred projects
|
||||
= render 'projects', projects: @starred_projects
|
||||
= paginate @starred_projects, theme: 'gitlab'
|
||||
= render 'explore/projects/nav'
|
||||
= render 'projects', projects: @starred_projects
|
||||
= paginate @starred_projects, theme: 'gitlab'
|
||||
|
|
|
@ -6,11 +6,5 @@
|
|||
- else
|
||||
= render 'explore/head'
|
||||
|
||||
.explore-trending-block
|
||||
.gray-content-block.second-block
|
||||
.pull-right
|
||||
= render 'explore/projects/dropdown'
|
||||
.oneline
|
||||
%i.fa.fa-comments-o
|
||||
See most discussed projects for last month
|
||||
= render 'projects', projects: @trending_projects
|
||||
= render 'explore/projects/nav'
|
||||
= render 'projects', projects: @trending_projects
|
||||
|
|
|
@ -11,9 +11,6 @@
|
|||
= icon('plus')
|
||||
New Milestone
|
||||
|
||||
.gray-content-block
|
||||
Milestone allows you to group issues and set due date for it
|
||||
|
||||
.milestones
|
||||
%ul.content-list
|
||||
= render @milestones
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
|
||||
.project-controls
|
||||
- if ci_commit
|
||||
= render_ci_status(ci_commit)
|
||||
|
||||
%span
|
||||
= render_ci_status(ci_commit)
|
||||
- if forks
|
||||
%span
|
||||
= icon('code-fork')
|
||||
|
|
Loading…
Reference in a new issue