Non-interactive AWS install by running a single script.
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md
This commit is contained in:
parent
eae41ad1df
commit
b80dd3d242
215 changed files with 3829 additions and 3348 deletions
|
@ -1,14 +1,7 @@
|
|||
- if @projects.any?
|
||||
.projects
|
||||
.activities.span8
|
||||
- if current_user.require_ssh_key?
|
||||
.alert.alert-error.padded
|
||||
%span
|
||||
You wont be able to pull/push project code unless you
|
||||
%strong
|
||||
= link_to new_key_path, class: "vlink" do
|
||||
add new key
|
||||
to your profile
|
||||
= render 'shared/no_ssh'
|
||||
- if @events.any?
|
||||
.content_list= render @events
|
||||
- else
|
||||
|
@ -26,13 +19,16 @@
|
|||
= link_to new_project_path, class: "btn very_small info" do
|
||||
%i.icon-plus
|
||||
New Project
|
||||
- @projects.each do |project|
|
||||
= link_to project_path(project), class: dom_class(project) do
|
||||
%h4
|
||||
%span.ico.project
|
||||
= truncate(project.name, length: 25)
|
||||
%span.right
|
||||
→
|
||||
%ul.unstyled
|
||||
- @projects.each do |project|
|
||||
%li.wll
|
||||
= link_to project_path(project), class: dom_class(project) do
|
||||
%strong.project_name= truncate(project.name, length: 25)
|
||||
%span.arrow
|
||||
→
|
||||
%span.last_activity
|
||||
%strong Last activity:
|
||||
%span= project_last_activity(project)
|
||||
.bottom= paginate @projects, theme: "gitlab"
|
||||
|
||||
%hr
|
||||
|
@ -57,5 +53,5 @@
|
|||
If you will be added to project - it will be displayed here
|
||||
|
||||
|
||||
:javascript
|
||||
:javascript
|
||||
$(function(){ Pager.init(20); });
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue