diff --git a/app/assets/javascripts/wall.js.coffee b/app/assets/javascripts/wall.js.coffee
deleted file mode 100644
index 4cc11331ac..0000000000
--- a/app/assets/javascripts/wall.js.coffee
+++ /dev/null
@@ -1,85 +0,0 @@
-class Wall
- constructor: (project_id) ->
- @project_id = project_id
- @note_ids = []
- @getContent()
- @initRefresh()
- @initForm()
-
- #
- # Gets an initial set of notes.
- #
- getContent: ->
- Api.notes @project_id, (notes) =>
- $.each notes, (i, note) =>
- # render note if it not present in loaded list
- # or skip if rendered
- if $.inArray(note.id, @note_ids) == -1
- @note_ids.push(note.id)
- @renderNote(note)
- @scrollDown()
- $("abbr.timeago").timeago()
-
- initRefresh: ->
- setInterval =>
- @refresh()
- , 10000
-
- refresh: ->
- @getContent()
-
- scrollDown: ->
- notes = $('ul.notes')
- $('body, html').scrollTop(notes.height())
-
- initForm: ->
- form = $('.wall-note-form')
- form.find("#target_type").val('wall')
-
- form.on 'ajax:success', =>
- @refresh()
- form.find(".js-note-text").val("").trigger("input")
-
- form.on 'ajax:complete', ->
- form.find(".js-comment-button").removeAttr('disabled')
- form.find(".js-comment-button").removeClass('disabled')
-
- form.on "click", ".js-choose-note-attachment-button", ->
- form.find(".js-note-attachment-input").click()
-
- form.on "change", ".js-note-attachment-input", ->
- filename = $(this).val().replace(/^.*[\\\/]/, '')
- form.find(".js-attachment-filename").text(filename)
-
- form.find('.note_text').keydown (e) ->
- if e.ctrlKey && e.keyCode == 13
- form.find('.js-comment-button').submit()
-
- form.show()
-
- renderNote: (note) ->
- template = @noteTemplate()
- template = template.replace('{{author_name}}', note.author.name)
- template = template.replace(/{{created_at}}/g, note.created_at)
- template = template.replace('{{text}}', simpleFormat(note.body))
-
- if note.attachment
- file = '
' + note.attachment + ' '
- else
- file = ''
- template = template.replace('{{file}}', file)
-
-
- $('ul.notes').append(template)
-
- noteTemplate: ->
- return '
- {{author_name}}
-
- {{text}}
- {{file}}
-
- {{created_at}}
- '
-
-@Wall = Wall
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index c53873f95a..7d058ad771 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -10,6 +10,7 @@
*= require_self
*= require nprogress
*= require nprogress-bootstrap
+ *= require dropzone/basic
*/
@import "main/*";
@@ -33,6 +34,7 @@
/**
* Page specific styles (issues, projects etc):
*/
+
@import "sections/*";
/**
@@ -49,3 +51,8 @@
* Styles for JS behaviors.
*/
@import "behaviors.scss";
+
+/**
+* Styles for responsive sidebar
+*/
+@import "semantic-ui/modules/sidebar"
diff --git a/app/assets/stylesheets/behaviors.scss b/app/assets/stylesheets/behaviors.scss
index 3fdc20485f..23f206ce3d 100644
--- a/app/assets/stylesheets/behaviors.scss
+++ b/app/assets/stylesheets/behaviors.scss
@@ -4,11 +4,3 @@
.js-details-container .content.hide { display: block; }
.js-details-container.open .content { display: block; }
.js-details-container.open .content.hide { display: none; }
-
-
-// Toggler
-//--------
-.js-toggler-container .turn-on { display: inherit; }
-.js-toggler-container .turn-off { display: none; }
-.js-toggler-container.on .turn-on { display: none; }
-.js-toggler-container.on .turn-off { display: inherit; }
diff --git a/app/assets/stylesheets/generic/buttons.scss b/app/assets/stylesheets/generic/buttons.scss
index dd0a2938cf..36fc771a9d 100644
--- a/app/assets/stylesheets/generic/buttons.scss
+++ b/app/assets/stylesheets/generic/buttons.scss
@@ -59,23 +59,21 @@
&.btn-primary {
color: #ffffff;
- background-color: #429bca;
- border-color: #358ebd;
+ background-color: $bg_primary;
+ border-color: $border_primary;
&.hover,
&:hover,
&.disabled,
&[disabled] {
color: #ffffff;
- background-color: #3286b1;
- border-color: #286e8e;
}
}
&.btn-success {
color: #ffffff;
- background-color: #5cb85c;
- border-color: #4cae4c;
+ background-color: $bg_success;
+ border-color: $border_success;
&.hover,
@@ -83,15 +81,27 @@
&.disabled,
&[disabled] {
color: #ffffff;
- background-color: #47a447;
- border-color: #398439;
}
}
&.btn-danger {
color: #ffffff;
- background-color: #d9534f;
- border-color: #d43f3a;
+ background-color: $bg_danger;
+ border-color: $border_danger;
+
+
+ &.hover,
+ &:hover,
+ &.disabled,
+ &[disabled] {
+ color: #ffffff;
+ }
+ }
+
+ &.btn-warning {
+ color: #ffffff;
+ background-color: $bg_warning;
+ border-color: $border_warning;
&.hover,
@@ -99,8 +109,6 @@
&.disabled,
&[disabled] {
color: #ffffff;
- background-color: #d2322d;
- border-color: #ac2925;
}
}
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 15e5533e91..4388845511 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -3,12 +3,7 @@
.clgray { color: #BBB }
.cred { color: #D12F19 }
.cgreen { color: #4a2 }
-.cblue { color: #29A }
-.cblack { color: #111 }
.cdark { color: #444 }
-.camber { color: #ffc000 }
-.cwhite { color: #fff!important }
-.bgred { background: #F2DEDE!important }
/** COMMON CLASSES **/
.prepend-top-10 { margin-top:10px }
@@ -60,23 +55,12 @@ pre {
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus {
- background: #29b;
+ background: $bg_style_color;
color: #FFF
}
-.breadcrumb > li + li:before {
- content: "/";
- padding: 0;
- color: #666;
-}
-
.str-truncated {
- display: inline-block;
- overflow: hidden;
- text-overflow: ellipsis;
- vertical-align: top;
- white-space: nowrap;
- max-width: 82%;
+ @include str-truncated;
}
/** FLASH message **/
diff --git a/app/assets/stylesheets/generic/files.scss b/app/assets/stylesheets/generic/files.scss
index 9e4207965f..1412277ffb 100644
--- a/app/assets/stylesheets/generic/files.scss
+++ b/app/assets/stylesheets/generic/files.scss
@@ -16,11 +16,11 @@
text-shadow: 0 1px 1px #fff;
margin: 0;
text-align: left;
- padding: 9px 10px;
+ padding: 10px 15px;
.options {
float: right;
- margin-top: -5px;
+ margin-top: -3px;
}
.left-options {
diff --git a/app/assets/stylesheets/generic/forms.scss b/app/assets/stylesheets/generic/forms.scss
index 36551f85b6..5258acca46 100644
--- a/app/assets/stylesheets/generic/forms.scss
+++ b/app/assets/stylesheets/generic/forms.scss
@@ -82,6 +82,7 @@ label {
font-family: $monospace_font;
$left: 12px;
.max-width-marker {
+ width: 72ch;
color: rgba(0, 0, 0, 0.0);
font-family: inherit;
left: $left;
@@ -98,3 +99,7 @@ label {
z-index: 2;
}
}
+
+.fieldset-form fieldset {
+ margin-bottom: 20px;
+}
diff --git a/app/assets/stylesheets/generic/issue_box.scss b/app/assets/stylesheets/generic/issue_box.scss
index bd69241798..c468980f64 100644
--- a/app/assets/stylesheets/generic/issue_box.scss
+++ b/app/assets/stylesheets/generic/issue_box.scss
@@ -17,52 +17,36 @@
&.issue-box-closed {
border-color: $border_danger;
.state {
- background-color: $bg_light_danger;
+ background-color: $bg_danger;
+ color: #FFF;
border-color: $border_danger;
- color: $color_danger;
- .state-label {
- background-color: $bg_danger;
- color: #FFF;
- }
}
}
&.issue-box-merged {
border-color: $border_primary;
.state {
- background-color: $bg_light_primary;
+ background-color: $bg_primary;
+ color: #FFF;
border-color: $border_primary;
- color: $color_primary;
- .state-label {
- background-color: $bg_primary;
- color: #FFF;
- }
}
}
&.issue-box-open {
border-color: $border_success;
.state {
- background-color: $bg_light_success;
border-color: $border_success;
- color: $color_success;
- .state-label {
- background-color: $bg_success;
- color: #FFF;
- }
+ background-color: $bg_success;
+ color: #FFF;
}
}
&.issue-box-expired {
border-color: #cea61b;
.state {
- background-color: #fcf8e3;
border-color: #faebcc;
- color: #8a6d3b;
- .state-label {
- background: #cea61b;
- color: #FFF;
- }
+ background: #cea61b;
+ color: #FFF;
}
}
@@ -72,23 +56,22 @@
.state {
border-bottom: 1px solid #DDD;
- line-height: 32px;
+ padding: 10px 15px;
}
.title {
- font-size: 22px;
- font-weight: 500;
+ font-size: 28px;
+ font-weight: normal;
line-height: 1.5;
margin: 0;
color: #333;
- padding-bottom: 0;
- padding: 15px 25px;
+ padding: 10px 15px;
}
.context {
border: none;
border-top: 1px solid #eee;
- padding: 15px 25px;
+ padding: 10px 15px;
// Reset text align for children
.text-right > * { text-align: left; }
@@ -104,7 +87,7 @@
}
.description {
- padding: 0 25px 15px 25px;
+ padding: 0 15px 10px 15px;
}
.title, .context, .description {
@@ -115,14 +98,15 @@
.state-label {
font-size: 14px;
- padding: 1px 25px;
- text-align: center;
- text-shadow: none;
- display: inline-block;
- line-height: 34px;
+ float: left;
+ font-weight: bold;
}
.creator {
- padding: 2px 15px;
+ float: right;
+ a {
+ color: #FFF;
+ text-decoration: underline;
+ }
}
}
diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss
index 963768044d..0cab6c44c9 100644
--- a/app/assets/stylesheets/generic/lists.scss
+++ b/app/assets/stylesheets/generic/lists.scss
@@ -8,7 +8,7 @@
list-style: none;
li {
- padding: 10px;
+ padding: 10px 15px;
min-height: 20px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid rgba(0, 0, 0, 0.05);
@@ -72,6 +72,15 @@
font-size: 14px;
line-height: 18px;
}
+
+ .row_title {
+ font-weight: 500;
+ color: #444;
+ &:hover {
+ color: #444;
+ text-decoration: underline;
+ }
+ }
}
}
diff --git a/app/assets/stylesheets/generic/markdown_area.scss b/app/assets/stylesheets/generic/markdown_area.scss
new file mode 100644
index 0000000000..fbfa72c5e5
--- /dev/null
+++ b/app/assets/stylesheets/generic/markdown_area.scss
@@ -0,0 +1,52 @@
+.div-dropzone-wrapper {
+ .div-dropzone {
+ position: relative;
+ padding: 0;
+ border: 0;
+ margin-bottom: 5px;
+
+ .div-dropzone-focus {
+ border-color: #66afe9 !important;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6) !important;
+ outline: 0 !important;
+ }
+
+ .div-dropzone-hover {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-top: -0.5em;
+ margin-left: -0.6em;
+ opacity: 0;
+ font-size: 50px;
+ transition: opacity 200ms ease-in-out;
+ }
+
+ .div-dropzone-spinner {
+ position: absolute;
+ top: 100%;
+ left: 100%;
+ margin-top: -1.1em;
+ margin-left: -1.1em;
+ opacity: 0;
+ font-size: 30px;
+ transition: opacity 200ms ease-in-out;
+ }
+
+ .div-dropzone-icon {
+ display: block;
+ text-align: center;
+ font-size: inherit;
+ }
+
+ .dz-preview {
+ display: none;
+ }
+ }
+}
+
+.div-dropzone-alert {
+ margin-top: 5px;
+ margin-bottom: 0;
+ transition: opacity 200ms ease-in-out;
+}
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss
index 03597c1fc7..0afd85aedf 100644
--- a/app/assets/stylesheets/generic/selects.scss
+++ b/app/assets/stylesheets/generic/selects.scss
@@ -3,13 +3,29 @@
.select2-choice {
background: #FFF;
border-color: #BBB;
+ padding: 6px 12px;
+ font-size: 13px;
+ line-height: 18px;
+ height: auto;
.select2-arrow {
background: #FFF;
+ border-left: 1px solid #DDD;
}
}
}
+.select2-container-multi .select2-choices {
+ @include border-radius(4px)
+}
+
+.select2-container-multi .select2-choices .select2-search-field input {
+ padding: 6px 12px;
+ font-size: 13px;
+ line-height: 18px;
+ height: auto;
+}
+
.select2-drop-active {
border: 1px solid #BBB !important;
margin-top: 4px;
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
new file mode 100644
index 0000000000..f6311ef74e
--- /dev/null
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -0,0 +1,46 @@
+.ui.sidebar {
+ z-index: 1000 !important;
+ background: #fff;
+ padding: 10px;
+ width: 285px;
+}
+
+.ui.right.sidebar {
+ border-left: 1px solid #e1e1e1;
+ border-right: 0;
+}
+
+.sidebar-expand-button {
+ cursor: pointer;
+ transition: all 0.4s;
+ -moz-transition: all 0.4s;
+ -webkit-transition: all 0.4s;
+}
+
+.fixed.sidebar-expand-button {
+ background: #f9f9f9;
+ color: #555;
+ padding: 9px 12px 6px 14px;
+ border: 1px solid #E1E1E1;
+ border-right: 0;
+ position: fixed;
+ top: 108px;
+ right: 0px;
+ margin-right: 0;
+ &:hover {
+ background: #ddd;
+ color: #333;
+ padding-right: 25px;
+ }
+}
+
+.btn.btn-default.sidebar-expand-button {
+ margin-left: 12px;
+ display: inline-block !important;
+}
+
+@media (min-width: 767px) {
+.btn.btn-default.sidebar-expand-button {
+ display: none!important;
+ }
+}
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index 8cc72d7f07..9aa819d40f 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -14,6 +14,7 @@ h2.page-title {
h3.page-title {
@include page-title;
+ font-size: 22px;
}
h6 {
@@ -40,7 +41,7 @@ a {
color: $link_color;
&:hover {
text-decoration: none;
- color: $primary_color;
+ color: $link_hover_color;
}
&:focus {
diff --git a/app/assets/stylesheets/generic/ui_box.scss b/app/assets/stylesheets/generic/ui_box.scss
deleted file mode 100644
index 7a977eae70..0000000000
--- a/app/assets/stylesheets/generic/ui_box.scss
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * UI box:
- * Block element for separating information on page.
- * Used for storing issues lists, grouped data.
- * You can have multiple ui boxes on one page
- *
- * Classes:
- * .ui-box - for any block & widgets
- * .ui-box.ui-box-small - same but with smaller title
- * .ui-box.ui-box-danger - with red title
- *
- * Ex. 1: List
- * .ui-box
- * .title
- * # title here
- * %ul
- * # content here
- *
- * Ex. 2: Block data
- * .ui-box
- * .title
- * # title here
- * .body
- * # content here
- *
- */
-
-.ui-box {
- background: #FFF;
- margin-bottom: 20px;
- border: 1px solid #DDD;
- word-wrap: break-word;
-
- img {
- max-width: 100%;
- }
-
- pre {
- code {
- background: none !important;
- }
- }
-
- ul {
- margin: 0;
- padding: 0;
- }
-
- .title {
- background-color: #EEE;
- border-bottom: 1px solid #DDD;
- color: #666;
- font-size: 16px;
- text-shadow: 0 1px 1px #fff;
- padding: 0 10px;
- font-size: 14px;
- line-height: 40px;
- font-weight: normal;
- margin: 0;
-
- > a {
- text-shadow: 0 1px 1px #fff;
- }
-
- form {
- margin-bottom: 0;
- margin-top: 0;
- }
-
- .btn {
- vertical-align: middle;
- padding: 4px 12px;
- @include box-shadow(0 0px 1px 1px #f2f2f2);
- }
-
- .nav-pills {
- > li {
- > a {
- padding: 13px;
- margin: 0;
- font-size: 13px;
- }
- &.active {
- > a {
- background: #D5D5D5;
- color: $style_color;
- @include border-radius(0);
- border-radius: 0;
- border-left: 1px solid #CCC;
- border-right: 1px solid #CCC;
- }
- }
- }
- }
- }
-
- .body {
- padding: 10px;
- }
-
- &.padded {
- h5, .title {
- margin: -20px;
- margin-bottom: 0;
- padding: 5px 20px;
- }
- }
-
- .row_title {
- font-weight: 500;
- color: #444;
- &:hover {
- color: #444;
- text-decoration: underline;
- }
- }
-
- .form-holder {
- padding-top: 20px;
- form {
- margin-bottom: 0;
- legend {
- text-indent: 10px;
- }
- .form-actions {
- margin-bottom: 0;
- }
- }
- }
-}
-
-/*
- * Small box
- */
-.ui-box.ui-box-small {
- margin-bottom: 10px;
-
- .title {
- font-size: 13px;
- line-height: 30px;
-
- a {
- color: #666;
- &:hover {
- text-decoration: underline;
- }
- }
- }
-}
-
-/*
- * Danger box
- */
-.ui-box.ui-box-danger {
- background: #f7f7f7;
- border: none;
-
- .title {
- background: #D65;
- color: #fff;
- text-shadow: none;
- font-weight: 500;
- }
-}
-
-/*
- * Block under tw-bootstrap tabs
- */
-.tab-pane {
- .ui-box {
- margin: 3px 3px 25px 3px;
- }
-}
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss
index 8676f07b1a..4271a7b310 100644
--- a/app/assets/stylesheets/gl_bootstrap.scss
+++ b/app/assets/stylesheets/gl_bootstrap.scss
@@ -7,8 +7,9 @@
*/
$font-size-base: 13px !default;
-$nav-pills-active-link-hover-bg: $bg_style_color;
-$pagination-active-bg: $bg_style_color;
+$nav-pills-active-link-hover-bg: $bg_primary;
+$pagination-active-bg: $bg_primary;
+$list-group-active-bg: $bg_style_color;
// Core variables and mixins
@import "bootstrap/variables";
@@ -113,8 +114,7 @@ $pagination-active-bg: $bg_style_color;
li {
> a {
- padding: 8px 20px;
- margin-right: 7px;
+ margin-right: 5px;
line-height: 20px;
border-color: #EEE;
color: #888;
@@ -199,20 +199,6 @@ $pagination-active-bg: $bg_style_color;
color: #3c763d;
}
-// Breadcrumb
-ul.breadcrumb {
- background: white;
- border: none;
- li {
- display: inline;
- text-shadow: 0 1px 0 white
- }
-
- a {
- font-size: 16px;
- }
-}
-
/**
* fix to keep tooltips position in top navigation bar
*
@@ -221,3 +207,108 @@ ul.breadcrumb {
position: relative;
white-space: nowrap;
}
+
+/**
+ * Add some extra stuff to panels
+ *
+ */
+.panel {
+ @include border-radius(0px);
+
+ .panel-heading {
+ @include border-radius(0px);
+ font-size: 14px;
+ line-height: 18px;
+
+ .panel-head-actions {
+ position: relative;
+ top: -7px;
+ float: right;
+ }
+ }
+
+ .panel-body {
+ form {
+ margin: 0;
+ }
+
+ .form-actions {
+ margin-bottom: 0;
+ background: #FFF;
+ }
+ }
+
+ .panel-footer {
+ .pagination {
+ margin: 0;
+ }
+ }
+
+ &.panel-small {
+ .panel-heading {
+ padding: 6px 15px;
+ font-size: 13px;
+ a {
+ color: #777;
+ }
+ }
+ }
+}
+
+.panel-default {
+ .panel-heading {
+ background-color: #EEE;
+ }
+}
+
+.panel-danger {
+ border-color: $border_danger;
+ .panel-heading {
+ color: #ffffff;
+ background-color: $bg_danger;
+ border-color: $border_danger;
+ a {
+ color: #FFF;
+ text-decoration: underline;
+ }
+ }
+}
+
+.panel-success {
+ border-color: $border_success;
+ .panel-heading {
+ color: #ffffff;
+ background-color: $bg_success;
+ border-color: $border_success;
+ a {
+ color: #FFF;
+ text-decoration: underline;
+ }
+ }
+}
+
+.panel-primary {
+ border-color: $border_primary;
+ .panel-heading {
+ color: #ffffff;
+ background-color: $bg_primary;
+ border-color: $border_primary;
+ a {
+ color: #FFF;
+ text-decoration: underline;
+ }
+ }
+}
+
+.panel-warning {
+ border-color: $border_warning;
+ .panel-heading {
+ color: #ffffff;
+ background-color: $bg_warning;
+ border-color: $border_warning;
+ a {
+ color: #FFF;
+ text-decoration: underline;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/main/mixins.scss b/app/assets/stylesheets/main/mixins.scss
index 8143cfa2c8..93faf5ced6 100644
--- a/app/assets/stylesheets/main/mixins.scss
+++ b/app/assets/stylesheets/main/mixins.scss
@@ -118,8 +118,17 @@
@mixin page-title {
color: #333;
- font-size: 20px;
line-height: 1.5;
+ font-weight: normal;
margin-top: 0px;
- margin-bottom: 15px;
+ margin-bottom: 10px;
+}
+
+@mixin str-truncated($max_width: 82%) {
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ vertical-align: top;
+ white-space: nowrap;
+ max-width: $max_width;
}
diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss
index f133777de5..68f7f6b858 100644
--- a/app/assets/stylesheets/main/variables.scss
+++ b/app/assets/stylesheets/main/variables.scss
@@ -1,37 +1,39 @@
-/**
+/*
* General Colors
*/
-$primary_color: #2FA0BB;
-$link_color: #3A89A3;
$style_color: #474D57;
$bg_style_color: #2299BB;
-$list-group-active-bg: $bg_style_color;
$hover: #D9EDF7;
+/*
+ * Link colors
+ */
+$link_color: #446e9b;
+$link_hover_color: #2FA0BB;
+
/*
* Success colors (green)
*/
-$border_success: #4cae4c;
-$bg_success: #5cb85c;
-$bg_light_success: #dff0d8;
-$color_success: #3c763d;
+$border_success: #019875;
+$bg_success: #019875;
/*
* Danger colors (red)
*/
$border_danger: #d43f3a;
$bg_danger: #d9534f;
-$bg_light_danger: #f2dede;
-$color_danger: #a94442;
/*
* Primary colors (blue)
*/
-$border_primary: #358ebd;
-$bg_primary: #429bca;
-$bg_light_primary: #d9edf7;
-$color_primary: #31708f;
+$border_primary: #446e9b;
+$bg_primary: #446e9b;
+/*
+ * Warning colors (yellow)
+ */
+$bg_warning: #EB9532;
+$border_warning: #EB9532;
/**
* Commit Diff Colors
diff --git a/app/assets/stylesheets/sections/admin.scss b/app/assets/stylesheets/sections/admin.scss
index a558633d11..a51deee797 100644
--- a/app/assets/stylesheets/sections/admin.scss
+++ b/app/assets/stylesheets/sections/admin.scss
@@ -21,12 +21,22 @@
}
.admin-filter form {
- label { width: 110px; }
- .controls { margin-left: 130px; }
- .form-actions { padding-left: 130px; background: #fff }
- .visibility-levels {
- .controls {
- margin-bottom: 9px;
+ .select2-container {
+ width: 100%
+ }
+
+ .controls {
+ margin-left: 130px;
+ }
+
+ .form-actions {
+ padding-left: 130px;
+ background: #fff
+ }
+
+ .visibility-levels {
+ .controls {
+ margin-bottom: 9px;
}
i {
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 855bb4ea01..ef8c5f089b 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -115,10 +115,6 @@
line-height: 2;
}
-.commit-breadcrumb {
- padding: 0;
-}
-
.commit-info-row {
margin-bottom: 10px;
.avatar {
@@ -140,8 +136,6 @@
* COMMIT ROW
*/
li.commit {
- padding: 8px;
-
.commit-row-title {
font-size: 14px;
margin-bottom: 2px;
@@ -212,3 +206,10 @@ li.commit {
}
}
}
+
+.commits-feed-holder {
+ float: right;
+ .btn {
+ padding: 4px 12px;
+ }
+}
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss
index e70757e040..6487e0acd9 100644
--- a/app/assets/stylesheets/sections/dashboard.scss
+++ b/app/assets/stylesheets/sections/dashboard.scss
@@ -1,10 +1,11 @@
.dashboard {
.side {
- .ui-box {
- margin: 0px;
- box-shadow: none;
-
- .nav-projects-tabs li { padding: 0; }
+ .panel {
+ .panel-heading {
+ background: #EEE;
+ border-top-left-radius: 0;
+ }
+ border-top-left-radius: 0;
}
}
}
@@ -24,9 +25,7 @@
.dashboard {
.dash-filter {
- margin: 7px 0;
- padding: 4px 6px;
- width: 220px;
+ width: 205px;
float: left;
height: inherit;
}
@@ -34,7 +33,7 @@
@media (max-width: 1200px) {
.dashboard .dash-filter {
- width: 150px;
+ width: 140px;
}
}
@@ -61,7 +60,7 @@
}
.project-row, .group-row {
- padding: 8px 12px !important;
+ padding: 8px 15px !important;
font-size: 14px;
line-height: 24px;
@@ -75,10 +74,8 @@
.arrow {
float: right;
- padding: 0px 5px;
margin: 0;
font-size: 20px;
- color: #666;
}
.last-activity {
@@ -112,6 +109,5 @@
.dash-project-access-icon {
float: left;
margin-right: 3px;
- color: #999;
width: 16px;
}
diff --git a/app/assets/stylesheets/sections/diff.scss b/app/assets/stylesheets/sections/diff.scss
index af44654d5d..f4926e2f52 100644
--- a/app/assets/stylesheets/sections/diff.scss
+++ b/app/assets/stylesheets/sections/diff.scss
@@ -11,7 +11,6 @@
> span {
font-family: $monospace_font;
- font-size: 14px;
line-height: 2;
}
@@ -19,9 +18,7 @@
float: right;
.btn {
- background-color: #EEE;
- color: #666;
- font-weight: bolder;
+ background-color: #FFF;
}
}
@@ -32,6 +29,7 @@
.file-mode {
font-family: $monospace_font;
+ margin-left: 10px;
}
}
.diff-content {
@@ -51,6 +49,11 @@
}
}
+ .file-mode-changed {
+ padding: 10px;
+ color: #777;
+ }
+
table {
width: 100%;
font-family: $monospace_font;
@@ -330,3 +333,8 @@
}
}
}
+
+.file-content .diff-file {
+ margin: 0;
+ border: none;
+}
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss
index b68f882220..957af62c0e 100644
--- a/app/assets/stylesheets/sections/events.scss
+++ b/app/assets/stylesheets/sections/events.scss
@@ -45,6 +45,7 @@
padding: 12px 0px;
border-bottom: 1px solid #eee;
.event-title {
+ @include str-truncated(72%);
color: #333;
font-weight: normal;
font-size: 14px;
@@ -135,6 +136,12 @@
}
}
}
+
+ .event-item-timestamp {
+ float: right;
+ color: #999;
+ line-height: 22px;
+ }
}
/**
@@ -166,3 +173,19 @@
}
}
}
+
+/*
+ * Last push widget
+ */
+.event-last-push {
+ .event-last-push-text {
+ @include str-truncated(75%);
+ line-height: 24px;
+ }
+}
+
+@media (max-width: $screen-xs-max) {
+ .event-item .event-title {
+ @include str-truncated(65%);
+ }
+}
diff --git a/app/assets/stylesheets/sections/graph.scss b/app/assets/stylesheets/sections/graph.scss
index 8a337a5e20..3d878d1e52 100644
--- a/app/assets/stylesheets/sections/graph.scss
+++ b/app/assets/stylesheets/sections/graph.scss
@@ -1,10 +1,10 @@
.project-network {
border: 1px solid #CCC;
- .tip {
+ .controls {
color: #888;
font-size: 14px;
- padding: 10px;
+ padding: 5px;
border-bottom: 1px solid #bbb;
background: #EEE;
}
diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss
index 1adbdfd979..b811b0bc66 100644
--- a/app/assets/stylesheets/sections/header.scss
+++ b/app/assets/stylesheets/sections/header.scss
@@ -137,6 +137,7 @@ header {
.profile-pic {
position: relative;
top: -1px;
+ padding-right: 0px !important;
img {
width: 26px;
height: 26px;
diff --git a/app/assets/stylesheets/sections/help.scss b/app/assets/stylesheets/sections/help.scss
new file mode 100644
index 0000000000..90ed98ba25
--- /dev/null
+++ b/app/assets/stylesheets/sections/help.scss
@@ -0,0 +1,19 @@
+.documentation-index {
+ h1 {
+ margin: 0;
+ }
+
+ h2 {
+ font-size: 20px;
+ }
+
+ li {
+ line-height: 24px;
+ color: #888;
+
+ a {
+ font-size: 14px;
+ margin-right: 3px;
+ }
+ }
+}
diff --git a/app/assets/stylesheets/sections/issues.scss b/app/assets/stylesheets/sections/issues.scss
index 02c9123178..495a7cb311 100644
--- a/app/assets/stylesheets/sections/issues.scss
+++ b/app/assets/stylesheets/sections/issues.scss
@@ -1,6 +1,6 @@
.issues-list {
.issue {
- padding: 10px;
+ padding: 10px 15px;
position: relative;
.issue-title {
@@ -27,7 +27,7 @@
display: none;
position: absolute;
top: 10px;
- right: 2px;
+ right: 15px;
}
&:hover {
@@ -42,7 +42,7 @@
height: 32px;
float: left;
margin-right: 12px;
- padding: 6px 10px;
+ padding: 6px 15px;
border: 1px solid #ccc;
@include border-radius(4px);
}
diff --git a/app/assets/stylesheets/sections/merge_requests.scss b/app/assets/stylesheets/sections/merge_requests.scss
index 2d9a5e4bbe..12044db670 100644
--- a/app/assets/stylesheets/sections/merge_requests.scss
+++ b/app/assets/stylesheets/sections/merge_requests.scss
@@ -19,12 +19,17 @@
}
}
-.merge-request .nav-tabs{
+.merge-request .merge-request-tabs{
+ border-bottom: 2px solid $border_primary;
+ margin: 20px 0;
+
li {
a {
- font-weight: bold;
- padding: 8px 20px;
- text-align: center;
+ padding: 15px 40px;
+ font-size: 14px;
+ margin-bottom: -2px;
+ border-bottom: 2px solid $border_primary;
+ @include border-radius(0px);
}
}
}
@@ -63,7 +68,7 @@
.mr-list {
.merge-request {
- padding: 10px;
+ padding: 10px 15px;
position: relative;
.merge-request-title {
@@ -99,12 +104,6 @@
}
.mr-state-widget {
- @include border-radius(0px);
-
- .panel-heading {
- @include border-radius(0px);
- }
-
.panel-body {
h4 {
margin-top: 0px;
@@ -119,3 +118,7 @@
.merge-request-show-labels .label {
padding: 6px 10px;
}
+
+.mr-commits .commit {
+ padding: 10px 15px;
+}
diff --git a/app/assets/stylesheets/sections/milestone.scss b/app/assets/stylesheets/sections/milestone.scss
new file mode 100644
index 0000000000..d20391e38f
--- /dev/null
+++ b/app/assets/stylesheets/sections/milestone.scss
@@ -0,0 +1,3 @@
+.issues-sortable-list .str-truncated {
+ max-width: 70%;
+}
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss
index 88f16a2159..59eaaec949 100644
--- a/app/assets/stylesheets/sections/nav.scss
+++ b/app/assets/stylesheets/sections/nav.scss
@@ -64,7 +64,7 @@
left: 50%;
width: 0;
height: 0;
- border-color: transparent transparent #29b transparent;
+ border-color: transparent transparent $link_color transparent;
border-style: solid;
border-width: 6px;
margin-left: -6px;
@@ -116,7 +116,7 @@
padding: 5px 0;
&.active {
- background-color: $primary_color;
+ background-color: $link_hover_color;
a {
color: #fff;
diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss
index 7e56781f56..e8d6ec3e29 100644
--- a/app/assets/stylesheets/sections/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -37,7 +37,7 @@ ul.notes {
font-weight: bold;
font-size: 14px;
&:hover {
- color: $primary_color;
+ color: $link_hover_color;
}
}
}
@@ -83,6 +83,7 @@ ul.notes {
overflow: hidden;
display: block;
position:relative;
+ border-bottom: 1px solid #eee;
p { color: $style_color; }
.avatar {
@@ -98,22 +99,16 @@ ul.notes {
.note-header {
padding-bottom: 3px;
}
+
+ &:last-child {
+ border-bottom: none;
+ }
}
.note:target {
-webkit-animation:target-note 2s linear;
background: #fffff0;
}
-
- // paint top or bottom borders depending on notes direction
- &:not(.reversed) .note,
- &:not(.reversed) .discussion {
- border-bottom: 1px solid #eee;
- }
- &.reversed .note,
- &.reversed .discussion {
- border-top: 1px solid #eee;
- }
}
.diff-file .notes_holder {
@@ -140,10 +135,6 @@ ul.notes {
border-width: 1px 0;
padding-top: 0;
vertical-align: top;
-
- li {
- padding: 5px;
- }
}
}
@@ -181,7 +172,7 @@ ul.notes {
@extend .cgray;
&:hover {
- color: $primary_color;
+ color: $link_hover_color;
&.danger { @extend .cred; }
}
}
@@ -271,29 +262,33 @@ ul.notes {
.clearfix {
margin-bottom: 0;
}
- .note_text_and_preview {
- // makes the "absolute" position for links relative to this
- position: relative;
- // preview/edit buttons
- > a {
- position: absolute;
- right: 5px;
- bottom: -60px;
+ .note-preview-holder,
+ .note_text {
+ background: #FFF;
+ border: 1px solid #ddd;
+ min-height: 100px;
+ padding: 5px;
+ font-size: 14px;
+ box-shadow: none;
+ }
+
+ .note-preview-holder {
+ > p {
+ overflow-x: auto;
}
- .note_preview {
- background: #f5f5f5;
- border: 1px solid #ddd;
- @include border-radius(4px);
- min-height: 80px;
- padding: 4px 6px;
- }
- .note_text {
+ }
+
+ .note_text {
+ width: 100%;
+ }
+ .nav-tabs {
+ margin-bottom: 0;
+ border: none;
+
+ li a,
+ li.active a {
border: 1px solid #DDD;
- box-shadow: none;
- font-size: 14px;
- height: 80px;
- width: 100%;
}
}
}
@@ -310,19 +305,16 @@ ul.notes {
float: none;
}
-
.common-note-form {
margin: 0;
background: #F9F9F9;
- padding: 3px;
+ padding: 5px;
border: 1px solid #DDD;
}
-
.note-form-actions {
background: #F9F9F9;
height: 45px;
- padding: 0 5px;
.note-form-option {
margin-top: 8px;
@@ -333,6 +325,18 @@ ul.notes {
.js-notify-commit-author {
float: left;
}
+
+ .write-preview-btn {
+ // makes the "absolute" position for links relative to this
+ position: relative;
+
+ // preview/edit buttons
+ > a {
+ position: absolute;
+ right: 5px;
+ top: 8px;
+ }
+ }
}
.note-edit-form {
@@ -367,3 +371,8 @@ ul.notes {
.parallel-comment {
padding: 6px;
}
+
+.error-alert > .alert {
+ margin-top: 5px;
+ margin-bottom: 5px;
+}
diff --git a/app/assets/stylesheets/sections/notifications.scss b/app/assets/stylesheets/sections/notifications.scss
new file mode 100644
index 0000000000..f11c5dff4a
--- /dev/null
+++ b/app/assets/stylesheets/sections/notifications.scss
@@ -0,0 +1,22 @@
+.global-notifications-form .level-title {
+ font-size: 15px;
+ color: #333;
+ font-weight: bold;
+}
+
+.notification-icon-holder {
+ width: 20px;
+ float: left;
+}
+
+.ns-part {
+ color: $bg_primary;
+}
+
+.ns-watch {
+ color: $bg_success;
+}
+
+.ns-mute {
+ color: $bg_danger;
+}
diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss
index 67aaa36938..ed73e1630f 100644
--- a/app/assets/stylesheets/sections/profile.scss
+++ b/app/assets/stylesheets/sections/profile.scss
@@ -1,9 +1,3 @@
-.update-notifications {
- .radio-inline {
- margin-right: 9%;
- }
-}
-
.account-page {
fieldset {
margin-bottom: 15px;
@@ -114,14 +108,3 @@
height: 50px;
}
}
-
-.global-notifications-form .level-title {
- font-size: 15px;
- color: #333;
- font-weight: bold;
-}
-
-.notification-icon-holder {
- width: 20px;
- float: left;
-}
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 5757858a1c..34dd3448f5 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -57,7 +57,7 @@
font-size: 17px;
background: #f1f1f1;
border-radius: 4px;
- color: #888;
+ color: #444;
position: absolute;
margin-left: -55px;
text-shadow: 0 1px 1px #FFF;
@@ -85,7 +85,7 @@
.btn {
background: none;
- color: #29b;
+ color: $link_color;
&.active {
color: #333;
@@ -179,11 +179,6 @@ ul.nav.nav-projects-tabs {
font-weight: normal;
}
-.new-tag-btn {
- position: relative;
- top: -5px;
-}
-
.public-projects .repo-info {
color: #777;
@@ -232,3 +227,27 @@ ul.nav.nav-projects-tabs {
.deploy-project-label {
margin: 1px;
}
+
+.vs-public {
+ color: $bg_primary;
+}
+
+.vs-internal {
+ color: $bg_warning;
+}
+
+.vs-private {
+ color: $bg_success;
+}
+
+.breadcrumb.repo-breadcrumb {
+ padding: 2px 0;
+ background: white;
+ border: none;
+ font-size: 16px;
+
+ > li + li:before {
+ padding: 0 3px;
+ color: #999;
+ }
+}
diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/sections/snippets.scss
index 84404b6ee3..d79591d991 100644
--- a/app/assets/stylesheets/sections/snippets.scss
+++ b/app/assets/stylesheets/sections/snippets.scss
@@ -3,3 +3,6 @@
padding-top: 0;
}
+.snippet-form-holder .file-holder .file-title {
+ padding: 2px;
+}
diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss
index 86e2a51641..b08f94f55a 100644
--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@@ -53,10 +53,14 @@
vertical-align: middle;
a {
&:hover {
- color: $primary_color;
+ color: $link_hover_color;
}
}
+ i {
+ color: $bg_primary;
+ }
+
img {
position: relative;
top:-1px;
@@ -109,18 +113,17 @@
}
}
-.tree-btn-group {
- top: 2px;
-
- .btn {
- margin-right: 0px;
- padding: 2px 10px;
- }
+.tree-download-holder .btn {
+ padding: 4px 12px;
}
.tree-ref-holder {
float: left;
- margin-top: 8px;
+ margin-right: 6px;
+
+ .select2-container .select2-choice, .select2-container.select2-drop-above .select2-choice {
+ padding: 4px 12px;
+ }
}
.readme-holder {
@@ -141,6 +144,8 @@
margin-bottom: 10px;
.commit {
+ padding: 10px 15px;
+
.commit-row-title {
font-size: 13px;
diff --git a/app/assets/stylesheets/sections/wall.scss b/app/assets/stylesheets/sections/wall.scss
deleted file mode 100644
index 3705afdb87..0000000000
--- a/app/assets/stylesheets/sections/wall.scss
+++ /dev/null
@@ -1,55 +0,0 @@
-.wall-page {
- .wall-note-form {
- @extend .col-md-12;
-
- margin: 0;
- height: 140px;
- background: #F9F9F9;
- position: fixed;
- bottom: 0px;
- padding: 3px;
- padding-bottom: 25px;
- border: 1px solid #DDD;
- }
-
- .notes {
- margin-bottom: 160px;
- background: #FFE;
- border: 1px solid #EED;
-
- > li {
- @extend .clearfix;
- border-bottom: 1px solid #EED;
- padding: 10px;
- }
-
- .wall-author {
- color: #666;
- float: left;
- font-size: 12px;
- width: 120px;
- text-overflow: ellipsis;
- white-space: nowrap;
- overflow: hidden;
- }
-
- .wall-text {
- border-left: 1px solid #CCC;
- margin-left: 10px;
- padding-left: 10px;
- float: left;
- width: 75%;
- }
-
- .wall-file {
- margin-left: 8px;
- background: #EEE;
- }
-
- abbr {
- float: right;
- color: #AAA;
- border: none;
- }
- }
-}
diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss
index 67616a4a10..308a03477d 100644
--- a/app/assets/stylesheets/themes/ui_modern.scss
+++ b/app/assets/stylesheets/themes/ui_modern.scss
@@ -16,28 +16,28 @@
@extend .header-dark;
&.navbar-gitlab {
.navbar-inner {
- background: #00AC7E;
- border-bottom: 1px solid #00AC7E;
+ background: #019875;
+ border-bottom: 1px solid #019875;
.app_logo, .navbar-toggle {
&:hover {
- background-color: #009C6E;
+ background-color: #018865;
}
}
.separator {
- background: #009C6F;
- border-left: 1px solid #10BC8E;
+ background: #018865;
+ border-left: 1px solid #11A885;
}
.nav > li > a {
color: #ADC;
}
.search-input {
- border-color: #7fd5be;
+ border-color: #8ba;
}
}
}
}
.nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
- background: #00AC7E;
+ background: #019875;
}
}
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 4bb3cf07da..1a523d081d 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -8,6 +8,8 @@ class Admin::GroupsController < Admin::ApplicationController
end
def show
+ @members = @group.members.order("group_access DESC").page(params[:members_page]).per(30)
+ @projects = @group.projects.page(params[:projects_page]).per(30)
end
def new
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 92ef596337..d2f86369b5 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -4,10 +4,8 @@ class Admin::ProjectsController < Admin::ApplicationController
before_filter :repository, only: [:show, :transfer]
def index
- owner_id = params[:owner_id]
- user = User.find_by(id: owner_id)
-
- @projects = user ? user.owned_projects : Project.all
+ @projects = Project.all
+ @projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present?
@projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present?
@projects = @projects.with_push if params[:with_push].present?
@projects = @projects.abandoned if params[:abandoned].present?
@@ -17,6 +15,11 @@ class Admin::ProjectsController < Admin::ApplicationController
end
def show
+ if @group
+ @group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30)
+ end
+
+ @project_members = @project.users_projects.page(params[:project_members_page]).per(30)
end
def transfer
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 5b06af79d5..5ecdfbd807 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -8,7 +8,8 @@ class Admin::UsersController < Admin::ApplicationController
end
def show
- @projects = user.authorized_projects
+ @personal_projects = user.personal_projects
+ @joined_projects = user.projects.joined(@user)
end
def new
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 90b0e51cf6..151b34e5b7 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,7 +4,6 @@ class ApplicationController < ActionController::Base
before_filter :authenticate_user!
before_filter :reject_blocked!
before_filter :check_password_expiration
- around_filter :set_current_user_for_thread
before_filter :add_abilities
before_filter :ldap_security_check
before_filter :dev_tools if Rails.env == 'development'
@@ -53,15 +52,6 @@ class ApplicationController < ActionController::Base
end
end
- def set_current_user_for_thread
- Thread.current[:current_user] = current_user
- begin
- yield
- ensure
- Thread.current[:current_user] = nil
- end
- end
-
def abilities
@abilities ||= Six.new
end
@@ -174,10 +164,13 @@ class ApplicationController < ActionController::Base
def add_gon_variables
gon.default_issues_tracker = Project.issues_tracker.default_value
gon.api_version = API::API.version
- gon.api_token = current_user.private_token if current_user
- gon.gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
- gon.gravatar_enabled = Gitlab.config.gravatar.enabled
+ gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
+
+ if current_user
+ gon.current_user_id = current_user.id
+ gon.api_token = current_user.private_token
+ end
end
def check_password_expiration
diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index bf30de565e..7937454810 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -14,4 +14,3 @@ class FilesController < ApplicationController
end
end
end
-
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 8344f74e6e..32419bb751 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -5,11 +5,11 @@ class GroupsController < ApplicationController
# Authorize
before_filter :authorize_read_group!, except: [:new, :create]
- before_filter :authorize_admin_group!, only: [:edit, :update, :destroy]
+ before_filter :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
before_filter :authorize_create_group!, only: [:new, :create]
# Load group projects
- before_filter :projects, except: [:new, :create]
+ before_filter :load_projects, except: [:new, :create, :projects, :edit, :update]
before_filter :default_filter, only: [:issues, :merge_requests]
@@ -81,9 +81,13 @@ class GroupsController < ApplicationController
def edit
end
+ def projects
+ @projects = @group.projects.page(params[:page])
+ end
+
def update
if @group.update_attributes(params[:group])
- redirect_to @group, notice: 'Group was successfully updated.'
+ redirect_to edit_group_path(@group), notice: 'Group was successfully updated.'
else
render action: "edit"
end
@@ -101,17 +105,17 @@ class GroupsController < ApplicationController
@group ||= Group.find_by(path: params[:id])
end
- def projects
+ def load_projects
@projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity.non_archived
end
def project_ids
- projects.pluck(:id)
+ @projects.pluck(:id)
end
# Dont allow unauthorized access to group
def authorize_read_group!
- unless @group and (projects.present? or can?(current_user, :read_group, @group))
+ unless @group and (@projects.present? or can?(current_user, :read_group, @group))
if current_user.nil?
return authenticate_user!
else
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 051cbdfaf0..fc498559d6 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -2,12 +2,12 @@ class HelpController < ApplicationController
def index
end
- def api
+ def show
@category = params[:category]
- @category = "README" if @category.blank?
+ @file = params[:file]
- if File.exists?(Rails.root.join('doc', 'api', @category + '.md'))
- render 'api'
+ if File.exists?(Rails.root.join('doc', @category, @file + '.md'))
+ render 'show'
else
not_found!
end
diff --git a/app/controllers/namespaces_controller.rb b/app/controllers/namespaces_controller.rb
new file mode 100644
index 0000000000..c59a2401ce
--- /dev/null
+++ b/app/controllers/namespaces_controller.rb
@@ -0,0 +1,18 @@
+class NamespacesController < ApplicationController
+ skip_before_filter :authenticate_user!
+
+ def show
+ namespace = Namespace.find_by(path: params[:id])
+
+ unless namespace
+ return render_404
+ end
+
+ if namespace.type == "Group"
+ redirect_to group_path(namespace)
+ else
+ redirect_to user_path(namespace.owner)
+ end
+ end
+end
+
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 6a6cbe4818..3c8e7ec73f 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -4,11 +4,12 @@ class Projects::BranchesController < Projects::ApplicationController
before_filter :require_non_empty_project
before_filter :authorize_code_access!
- before_filter :authorize_push!, only: [:create]
- before_filter :authorize_admin_project!, only: [:destroy]
+ before_filter :authorize_push!, only: [:create, :destroy]
def index
- @branches = Kaminari.paginate_array(@repository.branches).page(params[:page]).per(30)
+ @sort = params[:sort] || 'name'
+ @branches = @repository.branches_sorted_by(@sort)
+ @branches = Kaminari.paginate_array(@branches).page(params[:page]).per(30)
end
def recent
@@ -16,21 +17,18 @@ class Projects::BranchesController < Projects::ApplicationController
end
def create
- CreateBranchService.new.execute(project, params[:branch_name], params[:ref], current_user)
+ @branch = CreateBranchService.new.execute(project, params[:branch_name], params[:ref], current_user)
- redirect_to project_branches_path(@project)
+ redirect_to project_tree_path(@project, @branch.name)
end
def destroy
- branch = @repository.find_branch(params[:id])
-
- if branch && @repository.rm_branch(branch.name)
- Event.create_ref_event(@project, current_user, branch, 'rm')
- end
+ DeleteBranchService.new.execute(project, params[:id], current_user)
+ @branch_name = params[:id]
respond_to do |format|
format.html { redirect_to project_branches_path(@project) }
- format.js { render nothing: true }
+ format.js
end
end
end
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index c56df65dcb..860ab40829 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -12,7 +12,12 @@ class Projects::CommitController < Projects::ApplicationController
return git_not_found! unless @commit
@line_notes = project.notes.for_commit_id(commit.id).inline
- @branches = project.repository.branch_names_contains(commit.id)
+
+ @branches = begin
+ project.repository.branch_names_contains(commit.id)
+ rescue Grit::Git::GitTimeout
+ []
+ end
begin
@suppress_diff = true if commit.diff_suppress? && !params[:force_show_diff]
diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb
index aa902df0dd..3c21726483 100644
--- a/app/controllers/projects/group_links_controller.rb
+++ b/app/controllers/projects/group_links_controller.rb
@@ -4,7 +4,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
def index
@group_links = project.project_group_links.all
- @available_groups = Group.scoped
+ @available_groups = Group.all
@available_groups -= project.invited_groups
@available_groups -= [project.group]
end
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 4e7a716bfe..ddea8901f9 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -69,7 +69,9 @@ class Projects::IssuesController < Projects::ApplicationController
render :new
end
end
- format.js
+ format.js do |format|
+ @link = @issue.attachment.url.to_js
+ end
end
end
@@ -85,6 +87,12 @@ class Projects::IssuesController < Projects::ApplicationController
render :edit
end
end
+ format.json do
+ render json: {
+ saved: @issue.valid?,
+ assignee_avatar_url: @issue.assignee.try(:avatar_url)
+ }
+ end
end
end
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index b037cf5650..30fcb64cbb 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -16,6 +16,8 @@ class Projects::LabelsController < Projects::ApplicationController
redirect_to project_issues_path(@project)
elsif params[:redirect] == 'merge_requests'
redirect_to project_merge_requests_path(@project)
+ else
+ redirect_to project_labels_path(@project)
end
end
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 5d0c14bf21..384bbb709d 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -74,15 +74,27 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request.source_branch
)
+ @compare_failed = false
@commits = compare_action.commits
- @commits.map! { |commit| Commit.new(commit) }
- @commit = @commits.first
+
+ if @commits
+ @commits.map! { |commit| Commit.new(commit) }
+ @commit = @commits.first
+ else
+ # false value because failed to get commits from satellite
+ @commits = []
+ @compare_failed = true
+ end
@diffs = compare_action.diffs
@merge_request.title = @merge_request.source_branch.titleize.humanize
@merge_request.description = @merge_request.target_project.merge_requests_template
@target_project = @merge_request.target_project
@target_repo = @target_project.repository
+
+ diff_line_count = Commit::diff_line_count(@diffs)
+ @suppress_diff = Commit::diff_suppress?(@diffs, diff_line_count)
+ @force_suppress_diff = @suppress_diff
end
end
@@ -226,7 +238,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request_diff = @merge_request.merge_request_diff
@allowed_to_merge = allowed_to_merge?
@show_merge_controls = @merge_request.open? && @commits.any? && @allowed_to_merge
- @allowed_to_remove_source_branch = allowed_to_remove_source_branch?
@source_branch = @merge_request.source_project.repository.find_branch(@merge_request.source_branch).try(:name)
end
@@ -239,11 +250,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController
render 'invalid'
end
- def allowed_to_remove_source_branch?
- allowed_to_push_code?(@merge_request.source_project, @merge_request.source_branch) &&
- !@merge_request.disallow_source_branch_removal?
- end
-
def allowed_to_push_code?(project, branch)
action = if project.protected_branch?(branch)
:push_code_to_protected_branches
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index 05237bbd2d..c38c77d6b8 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -1,6 +1,6 @@
class Projects::MilestonesController < Projects::ApplicationController
before_filter :module_enabled
- before_filter :milestone, only: [:edit, :update, :destroy, :show]
+ before_filter :milestone, only: [:edit, :update, :destroy, :show, :sort_issues, :sort_merge_requests]
# Allow read any milestone
before_filter :authorize_read_milestone!
@@ -37,7 +37,7 @@ class Projects::MilestonesController < Projects::ApplicationController
end
def create
- @milestone = @project.milestones.new(params[:milestone])
+ @milestone = Milestones::CreateService.new(project, current_user, params[:milestone]).execute
if @milestone.save
redirect_to project_milestone_path(@project, @milestone)
@@ -47,7 +47,7 @@ class Projects::MilestonesController < Projects::ApplicationController
end
def update
- @milestone.update_attributes(params[:milestone])
+ @milestone = Milestones::UpdateService.new(project, current_user, params[:milestone]).execute(milestone)
respond_to do |format|
format.js
@@ -72,6 +72,26 @@ class Projects::MilestonesController < Projects::ApplicationController
end
end
+ def sort_issues
+ @issues = @milestone.issues.where(id: params['sortable_issue'])
+ @issues.each do |issue|
+ issue.position = params['sortable_issue'].index(issue.id.to_s) + 1
+ issue.save
+ end
+
+ render json: { saved: true }
+ end
+
+ def sort_merge_requests
+ @merge_requests = @milestone.merge_requests.where(id: params['sortable_merge_request'])
+ @merge_requests.each do |merge_request|
+ merge_request.position = params['sortable_merge_request'].index(merge_request.id.to_s) + 1
+ merge_request.save
+ end
+
+ render json: { saved: true }
+ end
+
protected
def milestone
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index cfc1bd99a2..e39e97af8d 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,9 +1,9 @@
class Projects::ProtectedBranchesController < Projects::ApplicationController
# Authorize
- before_filter :authorize_read_project!
before_filter :require_non_empty_project
+ before_filter :authorize_admin_project!
- before_filter :authorize_admin_project!, only: [:destroy, :create]
+ layout "project_settings"
def index
@branches = @project.protected_branches.to_a
diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb
index 7b8026cff9..8834a99508 100644
--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -31,9 +31,23 @@ class Projects::RefsController < Projects::ApplicationController
end
def logs_tree
- contents = tree.entries
- @logs = contents.map do |content|
- file = params[:path] ? File.join(params[:path], content.name) : content.name
+ @offset = if params[:offset].present?
+ params[:offset].to_i
+ else
+ 0
+ end
+
+ @limit = 10
+
+ @path = params[:path]
+
+ contents = []
+ contents += tree.trees
+ contents += tree.blobs
+ contents += tree.submodules
+
+ @logs = contents[@offset, @limit].to_a.map do |content|
+ file = @path ? File.join(@path, content.name) : content.name
last_commit = @repo.last_commit_for_path(@commit.id, file)
{
file_name: content.name,
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 0b99165bf6..e03a9f4d66 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -13,11 +13,8 @@ class Projects::TagsController < Projects::ApplicationController
end
def create
- @repository.add_tag(params[:tag_name], params[:ref])
-
- if new_tag = @repository.find_tag(params[:tag_name])
- Event.create_ref_event(@project, current_user, new_tag, 'add', 'refs/tags')
- end
+ @tag = CreateTagService.new.execute(@project, params[:tag_name],
+ params[:ref], current_user)
redirect_to project_tags_path(@project)
end
diff --git a/app/controllers/projects/walls_controller.rb b/app/controllers/projects/walls_controller.rb
deleted file mode 100644
index 834215a147..0000000000
--- a/app/controllers/projects/walls_controller.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class Projects::WallsController < Projects::ApplicationController
- before_filter :module_enabled
-
- respond_to :js, :html
-
- def show
- @note = @project.notes.new
-
- respond_to do |format|
- format.html
- end
- end
-
- protected
-
- def module_enabled
- return render_404 unless @project.wall_enabled
- end
-end
-
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ebb8a90c63..9e14af6204 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -44,7 +44,7 @@ class ProjectsController < ApplicationController
end
def transfer
- ::Projects::TransferService.new(project, current_user, params).execute
+ ::Projects::TransferService.new(project, current_user, params[:project]).execute
end
def show
@@ -162,8 +162,29 @@ class ProjectsController < ApplicationController
end
end
+ def upload_image
+ link_to_image = ::Projects::ImageService.new(repository, params, root_url).execute
+
+ respond_to do |format|
+ if link_to_image
+ format.json { render json: { link: link_to_image } }
+ else
+ format.json { render json: "Invalid file.", status: :unprocessable_entity }
+ end
+ end
+ end
+
private
+ def upload_path
+ base_dir = FileUploader.generate_dir
+ File.join(repository.path_with_namespace, base_dir)
+ end
+
+ def accepted_images
+ %w(png jpg jpeg gif)
+ end
+
def set_title
@title = 'New Project'
end
@@ -190,6 +211,6 @@ class ProjectsController < ApplicationController
end
def sorted(users)
- users.uniq.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
+ users.uniq.to_a.compact.sort_by(&:username).map { |user| { username: user.username, name: user.name } }
end
end
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 0dd941a48e..4fe98f804d 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -14,7 +14,7 @@ class SnippetsController < ApplicationController
layout 'navless'
def index
- @snippets = Snippet.public.fresh.non_expired.page(params[:page]).per(20)
+ @snippets = Snippet.are_public.fresh.non_expired.page(params[:page]).per(20)
end
def user_index
@@ -26,15 +26,15 @@ class SnippetsController < ApplicationController
if @user == current_user
@snippets = case params[:scope]
- when 'public' then
- @snippets.public
- when 'private' then
- @snippets.private
+ when 'are_public' then
+ @snippets.are_public
+ when 'are_private' then
+ @snippets.are_private
else
@snippets
end
else
- @snippets = @snippets.public
+ @snippets = @snippets.are_public
end
@snippets = @snippets.page(params[:page]).per(20)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9461174b95..0b442f5383 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,12 +4,24 @@ class UsersController < ApplicationController
def show
@user = User.find_by_username!(params[:username])
- @projects = @user.authorized_projects.accessible_to(current_user)
- if !current_user && @projects.empty?
+
+ unless current_user || @user.public_profile?
return authenticate_user!
end
- @groups = @user.groups.accessible_to(current_user)
- @events = @user.recent_events.where(project_id: @projects.pluck(:id)).limit(20)
+
+ # Projects user can view
+ authorized_projects_ids = ProjectsFinder.new.execute(current_user).pluck(:id)
+
+ @projects = @user.personal_projects.
+ where(id: authorized_projects_ids)
+
+ # Collect only groups common for both users
+ @groups = @user.groups & GroupsFinder.new.execute(current_user)
+
+ # Get user activity feed for projects common for both users
+ @events = @user.recent_events.
+ where(project_id: authorized_projects_ids).limit(20)
+
@title = @user.name
end
diff --git a/app/finders/base_finder.rb b/app/finders/base_finder.rb
index 7fc5840561..7150bb2e31 100644
--- a/app/finders/base_finder.rb
+++ b/app/finders/base_finder.rb
@@ -49,7 +49,7 @@ class BaseFinder
elsif current_user && params[:authorized_only].presence
klass.of_projects(current_user.authorized_projects).references(:project)
else
- klass.of_projects(Project.accessible_to(current_user)).references(:project)
+ klass.of_projects(ProjectsFinder.new.execute(current_user)).references(:project)
end
end
diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb
new file mode 100644
index 0000000000..d3597ef090
--- /dev/null
+++ b/app/finders/groups_finder.rb
@@ -0,0 +1,38 @@
+class GroupsFinder
+ def execute(current_user, options = {})
+ all_groups(current_user)
+ end
+
+ private
+
+ def all_groups(current_user)
+ if current_user
+ if current_user.authorized_groups.any?
+ # User has access to groups
+ #
+ # Return only:
+ # groups with public projects
+ # groups with internal projects
+ # groups with joined projects
+ #
+ group_ids = Project.public_and_internal_only.pluck(:namespace_id) +
+ current_user.authorized_groups.pluck(:id)
+ Group.where(id: group_ids)
+ else
+ # User has no group membership
+ #
+ # Return only:
+ # groups with public projects
+ # groups with internal projects
+ #
+ Group.where(id: Project.public_and_internal_only.pluck(:namespace_id))
+ end
+ else
+ # Not authenticated
+ #
+ # Return only:
+ # groups with public projects
+ Group.where(id: Project.public_only.pluck(:namespace_id))
+ end
+ end
+end
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index bfaba75878..26898bad49 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -1,5 +1,5 @@
class ProjectsFinder
- def execute(current_user, options)
+ def execute(current_user, options = {})
group = options[:group]
if group
@@ -56,8 +56,36 @@ class ProjectsFinder
end
end
- def all_projects
- # TODO: implement
- raise 'Not implemented yet'
+ def all_projects(current_user)
+ if current_user
+ if current_user.authorized_projects.any?
+ # User has access to private projects
+ #
+ # Return only:
+ # public projects
+ # internal projects
+ # joined projects
+ #
+ Project.where(
+ "projects.id IN (?) OR projects.visibility_level IN (?)",
+ current_user.authorized_projects.pluck(:id),
+ Project.public_and_internal_levels
+ )
+ else
+ # User has no access to private projects
+ #
+ # Return only:
+ # public projects
+ # internal projects
+ #
+ Project.public_and_internal_only
+ end
+ else
+ # Not authenticated
+ #
+ # Return only:
+ # public projects
+ Project.public_only
+ end
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d8ba2727cc..333a2fcc65 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -60,23 +60,21 @@ module ApplicationHelper
def avatar_icon(user_email = '', size = nil)
user = User.find_by(email: user_email)
- if user && user.avatar.present?
- user.avatar.url
+
+ if user
+ user.avatar_url(size) || default_avatar
else
gravatar_icon(user_email, size)
end
end
def gravatar_icon(user_email = '', size = nil)
- size = 40 if size.nil? || size <= 0
+ GravatarService.new.execute(user_email, size) ||
+ default_avatar
+ end
- if !Gitlab.config.gravatar.enabled || user_email.blank?
- '/assets/no_avatar.png'
- else
- gravatar_url = request.ssl? || gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
- user_email.strip!
- sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size, email: user_email
- end
+ def default_avatar
+ image_path('no_avatar.png')
end
def last_commit(project)
@@ -226,8 +224,11 @@ module ApplicationHelper
GitHub::Markup.render(file_name, file_content).html_safe
end
- def spinner(text = nil)
- content_tag :div, class: 'loading hide' do
+ def spinner(text = nil, visible = false)
+ css_class = "loading"
+ css_class << " hide" unless visible
+
+ content_tag :div, class: css_class do
content_tag(:i, nil, class: 'icon-spinner icon-spin') + text
end
end
@@ -235,4 +236,31 @@ module ApplicationHelper
def ldap_enabled?
Gitlab.config.ldap.enabled
end
+
+ def link_to(name = nil, options = nil, html_options = nil, &block)
+ begin
+ uri = URI(options)
+ host = uri.host
+ absolute_uri = uri.absolute?
+ rescue URI::InvalidURIError, ArgumentError
+ host = nil
+ absolute_uri = nil
+ end
+
+ # Add "nofollow" only to external links
+ if host && host != Gitlab.config.gitlab.host && absolute_uri
+ if html_options
+ if html_options[:rel]
+ html_options[:rel] << " nofollow"
+ else
+ html_options.merge!(rel: "nofollow")
+ end
+ else
+ html_options = Hash.new
+ html_options[:rel] = "nofollow"
+ end
+ end
+
+ super
+ end
end
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
new file mode 100644
index 0000000000..11fbf1baae
--- /dev/null
+++ b/app/helpers/blob_helper.rb
@@ -0,0 +1,18 @@
+module BlobHelper
+ def highlightjs_class(blob_name)
+ if blob_name.include?('.')
+ ext = blob_name.split('.').last
+ return 'language-' + ext
+ else
+ if no_highlight_files.include?(blob_name.downcase)
+ 'no-highlight'
+ else
+ blob_name.downcase
+ end
+ end
+ end
+
+ def no_highlight_files
+ %w(credits changelog copying copyright license authors)
+ end
+end
diff --git a/app/helpers/branches_helper.rb b/app/helpers/branches_helper.rb
new file mode 100644
index 0000000000..2ec2cc9615
--- /dev/null
+++ b/app/helpers/branches_helper.rb
@@ -0,0 +1,22 @@
+module BranchesHelper
+ def can_remove_branch?(project, branch_name)
+ if project.protected_branch? branch_name
+ false
+ elsif branch_name == project.repository.root_ref
+ false
+ else
+ can?(current_user, :push_code, project)
+ end
+ end
+
+ def can_push_branch?(project, branch_name)
+ return false unless project.repository.branch_names.include?(branch_name)
+ action = if project.protected_branch?(branch_name)
+ :push_code_to_protected_branches
+ else
+ :push_code
+ end
+
+ current_user.can?(action, project)
+ end
+end
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index c4abdbdabc..4d27cf2851 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -76,15 +76,13 @@ module CommitsHelper
# Add the root project link and the arrow icon
crumbs = content_tag(:li) do
- content_tag(:span, nil, class: 'arrow') +
- link_to(@project.name, project_commits_path(@project, @ref))
+ link_to(@project.path, project_commits_path(@project, @ref))
end
if @path
parts = @path.split('/')
parts.each_with_index do |part, i|
- crumbs += content_tag(:span, ' / ', class: 'divider')
crumbs += content_tag(:li) do
# The text is just the individual part, but the link needs all the parts before it
link_to part, project_commits_path(@project, tree_join(@ref, parts[0..i].join('/')))
@@ -195,11 +193,11 @@ module CommitsHelper
def commit_person_link(commit, options = {})
source_name = commit.send "#{options[:source]}_name".to_sym
source_email = commit.send "#{options[:source]}_email".to_sym
-
+
user = User.find_for_commit(source_email, source_name)
person_name = user.nil? ? source_name : user.name
person_email = user.nil? ? source_email : user.email
-
+
text = if options[:avatar]
avatar = image_tag(avatar_icon(person_email, options[:size]), class: "avatar #{"s#{options[:size]}" if options[:size]}", width: options[:size], alt: "")
%Q{#{avatar}
#{person_name} }
@@ -218,4 +216,8 @@ module CommitsHelper
link_to(text.html_safe, user_path(user), options)
end
end
+
+ def diff_file_mode_changed?(diff)
+ diff.a_mode && diff.b_mode && diff.a_mode != diff.b_mode
+ end
end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 929f9a9c38..d3904e16c1 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -109,8 +109,6 @@ module EventsHelper
"#{event.note_target_type} ##{truncate event.note_target_iid}"
end
end
- elsif event.wall_note?
- link_to 'wall', project_wall_path(event.project)
else
content_tag :strong do
"(deleted)"
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 69425bc171..db5b4eacd1 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -19,7 +19,7 @@ module GitlabMarkdownHelper
escape_once(body)
end
- gfm_body = gfm(escaped_body, html_options)
+ gfm_body = gfm(escaped_body, @project, html_options)
gfm_body.gsub!(%r{
.*?}m) do |match|
"#{match}#{link_to("", url, html_options)[0..-5]}" # "".length +1
@@ -59,90 +59,67 @@ module GitlabMarkdownHelper
end
end
- # text - whole text from a markdown file
- # project_path_with_namespace - namespace/projectname, eg. gitlabhq/gitlabhq
- # ref - name of the branch or reference, eg. stable
- # requested_path - path of request, eg. doc/api/README.md, used in special case when path is pointing to the .md file were the original request is coming from
- def create_relative_links(text, project, ref, requested_path)
- @path_to_satellite = project.satellite.path
- project_path_with_namespace = project.path_with_namespace
+ def create_relative_links(text)
paths = extract_paths(text)
- paths.each do |file_path|
- original_file_path = extract(file_path)
- new_path = rebuild_path(project_path_with_namespace, original_file_path, requested_path, ref)
- if reference_path?(file_path)
- # Replacing old string with a new one that contains updated path
- # eg. [some document]: document.md will be replaced with [some document] /namespace/project/master/blob/document.md
- text.gsub!(file_path, file_path.gsub(original_file_path, "/#{new_path}"))
- else
- # Replacing old string with a new one with brackets ]() to prevent replacing occurence of a word
- # e.g. If we have a markdown like [test](test) this will replace ](test) and not the word test
- text.gsub!("](#{file_path})", "](/#{new_path})")
- end
+
+ paths.uniq.each do |file_path|
+ new_path = rebuild_path(file_path)
+ # Finds quoted path so we don't replace other mentions of the string
+ # eg. "doc/api" will be replaced and "/home/doc/api/text" won't
+ text.gsub!("\"#{file_path}\"", "\"/#{new_path}\"")
end
+
text
end
- def extract_paths(markdown_text)
- all_markdown_paths = pick_out_paths(markdown_text)
- paths = remove_empty(all_markdown_paths)
- select_relative(paths)
+ def extract_paths(text)
+ links = substitute_links(text)
+ image_links = substitute_image_links(text)
+ links + image_links
end
- # Split the markdown text to each line and find all paths, this will match anything with - ]("some_text") and [some text]: file.md
- def pick_out_paths(markdown_text)
- inline_paths = markdown_text.split("\n").map { |text| text.scan(/\]\(([^(]+)\)/) }
- reference_paths = markdown_text.split("\n").map { |text| text.scan(/\[.*\]:.*/) }
- inline_paths + reference_paths
+ def substitute_links(text)
+ links = text.scan(//)
+ relative_links = links.flatten.reject{ |link| link_to_ignore? link }
+ relative_links
end
- # Removes any empty result produced by not matching the regexp
- def remove_empty(paths)
- paths.reject{|l| l.empty? }.flatten
+ def substitute_image_links(text)
+ links = text.scan(/#{link_to "guidelines for contribution", contribution_guide_url} to this repository.".html_safe
+
= form_for [@project, @issue], html: { class: 'form-horizontal issue-form' } do |f|
-if @issue.errors.any?
.alert.alert-danger
@@ -19,8 +20,12 @@
.form-group
= f.label :description, 'Description', class: 'control-label'
.col-sm-10
- = f.text_area :description, class: "form-control js-gfm-input", rows: 14
- %p.hint Issues are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+ = f.text_area :description, class: 'form-control js-gfm-input markdown-area', rows: 14
+ .col-sm-12.hint
+ .pull-left Issues are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
+ .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ .clearfix
+ .error-alert
%hr
.form-group
.issue-assignee
@@ -30,7 +35,7 @@
.col-sm-10
= project_users_select_tag('issue[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @issue.assignee_id)
- = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
+ = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
.form-group
.issue-milestone
= f.label :milestone_id, class: 'control-label' do
@@ -57,9 +62,6 @@
- cancel_path = @issue.new_record? ? project_issues_path(@project) : project_issue_path(@project, @issue)
= link_to "Cancel", cancel_path, class: 'btn btn-cancel'
-
-
-
:javascript
$("#issue_label_list")
.bind( "keydown", function( event ) {
@@ -94,3 +96,5 @@
$('#issue_assignee_id').val("#{current_user.id}").trigger("change");
e.preventDefault();
});
+
+ window.project_image_path_upload = "#{upload_image_project_path @project}";
diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml
index f1e866c8e9..716ea7cefe 100644
--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
@@ -9,6 +9,11 @@
= nav_link(controller: :labels) do
= link_to 'Labels', project_labels_path(@project), class: "tab"
+ - if current_controller?(:milestones)
+ %li.pull-right
+ %button.btn.btn-default.sidebar-expand-button
+ %i.icon.icon-list
+
- if current_controller?(:issues)
- if current_user
%li
@@ -17,6 +22,8 @@
%li.pull-right
.pull-right
+ %button.btn.btn-default.sidebar-expand-button
+ %i.icon.icon-list
= form_tag project_issues_path(@project), 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, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml
index 425dcb45dd..d7987f43fb 100644
--- a/app/views/projects/issues/_issue_context.html.haml
+++ b/app/views/projects/issues/_issue_context.html.haml
@@ -1,6 +1,6 @@
= form_for [@project, @issue], remote: true, html: {class: 'edit-issue inline-update'} do |f|
.row
- .col-md-6
+ .col-sm-6
%strong.append-right-10
Assignee:
@@ -11,7 +11,7 @@
- else
None
- .col-md-6.text-right
+ .col-sm-6.text-right
%strong.append-right-10
Milestone:
- if can?(current_user, :modify_issue, @issue)
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index e85ff3a786..1d0dcd7f07 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -61,7 +61,7 @@
= hidden_field_tag :status, params[:status]
= button_tag "Update issues", class: "btn update_selected_issues btn-save"
-.ui-box
+.panel.panel-default
%ul.well-list.issues-list
= render @issues
- if @issues.blank?
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 51a8c911af..2e66d05956 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,6 +1,8 @@
= render "head"
.row
- .col-md-3
+ .fixed.fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs
+ %i.icon-list.icon-2x
+ .col-md-3.responsive-side
= render 'shared/project_filter', project_entities_path: project_issues_path(@project),
labels: true, redirect: 'issues'
.col-md-9.issues-holder
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index b6d3a8edf4..695eb22575 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -32,13 +32,13 @@
.issue-box{ class: issue_box_class(@issue) }
.state.clearfix
- .state-label.col-sm-2.col-xs-12
+ .state-label
- if @issue.closed?
Closed
- else
Open
- %span.creator.col-sm-9.col-xs-12
+ .creator
Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)}
%h4.title
diff --git a/app/views/projects/merge_requests/_form.html.haml b/app/views/projects/merge_requests/_form.html.haml
index 290a15e266..9ef232b526 100644
--- a/app/views/projects/merge_requests/_form.html.haml
+++ b/app/views/projects/merge_requests/_form.html.haml
@@ -22,8 +22,12 @@
.form-group
= f.label :description, "Description", class: 'control-label'
.col-sm-10
- = f.text_area :description, class: "form-control js-gfm-input", rows: 14
- %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+ = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 14
+ .col-sm-12.hint
+ .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
+ .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ .clearfix
+ .error-alert
%hr
.form-group
.issue-assignee
@@ -33,7 +37,7 @@
.col-sm-10
= project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id)
- = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
+ = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
.form-group
.issue-milestone
= f.label :milestone_id, class: 'control-label' do
@@ -98,3 +102,5 @@
return false;
}
});
+
+ window.project_image_path_upload = "#{upload_image_project_path @project}";
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index a8b774a3cd..f8f14a71a1 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -33,18 +33,23 @@
%div= msg
- if @merge_request.source_branch.present? && @merge_request.target_branch.present?
- .light-well
- %center
- %h4
- There isn't anything to merge.
- %p.slead
- - if @merge_request.source_branch == @merge_request.target_branch
- You'll need to use different branch names to get a valid comparison.
- - else
- %span.label-branch #{@merge_request.source_branch}
- and
- %span.label-branch #{@merge_request.target_branch}
- are the same.
+ - if @compare_failed
+ .alert.alert-danger
+ %h4 Compare failed
+ %p We can't compare selected branches. It may be because of huge diff or satellite timeout. Please try again or select different branches.
+ - else
+ .light-well
+ %center
+ %h4
+ There isn't anything to merge.
+ %p.slead
+ - if @merge_request.source_branch == @merge_request.target_branch
+ You'll need to use different branch names to get a valid comparison.
+ - else
+ %span.label-branch #{@merge_request.source_branch}
+ and
+ %span.label-branch #{@merge_request.target_branch}
+ are the same.
%hr
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index b5479be708..34a30975e0 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -23,8 +23,11 @@
.form-group
.light
= f.label :description, "Description"
- = f.text_area :description, class: "form-control js-gfm-input", rows: 10
- %p.hint Description is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+ = f.text_area :description, class: "form-control js-gfm-input markdown-area", rows: 10
+ .clearfix.hint
+ .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
+ .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ .error-alert
.form-group
.issue-assignee
= f.label :assignee_id do
@@ -33,7 +36,7 @@
%div
= project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select a user', class: 'custom-form-control', selected: @merge_request.assignee_id, project_id: @merge_request.target_project_id)
- = link_to 'Assign to me', '#', class: 'btn btn-small assign-to-me-link'
+ = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
.form-group
.issue-milestone
= f.label :milestone_id do
@@ -54,8 +57,8 @@
= f.submit 'Submit merge request', class: "btn btn-create"
.mr-compare
- %div.ui-box
- .title
+ %div.panel.panel-default
+ .panel-heading
Commits (#{@commits.count})
- if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
%ul.well-list
@@ -80,3 +83,5 @@
$('#merge_request_assignee_id').val("#{current_user.id}").trigger("change");
e.preventDefault();
});
+
+ window.project_image_path_upload = "#{upload_image_project_path @project}";
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 83d6caa02c..486454793b 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -7,15 +7,17 @@
= render "projects/merge_requests/show/participants"
- if @commits.present?
- %ul.nav.nav-tabs
+ %ul.nav.nav-pills.merge-request-tabs
%li.notes-tab{data: {action: 'notes'}}
= link_to project_merge_request_path(@project, @merge_request) do
%i.icon-comment
Discussion
+ %span.badge= @merge_request.mr_and_commit_notes.count
%li.diffs-tab{data: {action: 'diffs'}}
= link_to diffs_project_merge_request_path(@project, @merge_request) do
%i.icon-list-alt
Changes
+ %span.badge= @merge_request.diffs.size
- content_for :note_actions do
- if can?(current_user, :modify_merge_request, @merge_request)
@@ -24,11 +26,11 @@
- if @merge_request.closed?
= link_to 'Reopen', project_merge_request_path(@project, @merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-grouped btn-reopen reopen-mr-link", title: "Close merge request"
- .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
- = render "projects/notes/notes_with_form"
.diffs.tab-content
- if current_page?(action: 'diffs')
= render "projects/merge_requests/show/diffs"
+ .notes.tab-content.voting_notes#notes{ class: (controller.action_name == 'show') ? "" : "hide" }
+ = render "projects/notes/notes_with_form"
.status
:javascript
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index 12a72edb22..4bb803eb6d 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -7,7 +7,9 @@
%span (#{@merge_requests.total_count})
%hr
.row
- .col-md-3
+ .fixed.sidebar-expand-button.hidden-lg.hidden-md
+ %i.icon-list.icon-2x
+ .col-md-3.responsive-side
= render 'shared/project_filter', project_entities_path: project_merge_requests_path(@project),
labels: true, redirect: 'merge_requests'
.col-md-9
@@ -61,7 +63,7 @@
.pull-right
= render 'shared/sort_dropdown'
- .ui-box
+ .panel.panel-default
%ul.well-list.mr-list
= render @merge_requests
- if @merge_requests.blank?
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index f69146e1a3..92a7bb927e 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1,9 +1,9 @@
- if @commits.present?
- .ui-box
- .title
+ .panel.panel-default
+ .panel-heading
%i.icon-list
Commits (#{@commits.count})
- .commits
+ .commits.mr-commits
- if @commits.count > 8
%ul.first-commits.well-list
- @commits.first(8).each do |commit|
diff --git a/app/views/projects/merge_requests/show/_context.html.haml b/app/views/projects/merge_requests/show/_context.html.haml
index 5c6734fd24..ab00b34242 100644
--- a/app/views/projects/merge_requests/show/_context.html.haml
+++ b/app/views/projects/merge_requests/show/_context.html.haml
@@ -1,6 +1,6 @@
= form_for [@project, @merge_request], remote: true, html: {class: 'edit-merge_request inline-update'} do |f|
.row
- .col-md-6
+ .col-sm-6
%strong.append-right-10
Assignee:
@@ -11,7 +11,7 @@
- else
None
- .col-md-6.text-right
+ .col-sm-6.text-right
%strong.append-right-10
Milestone:
- if can?(current_user, :modify_merge_request, @merge_request)
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 1276489c2d..07e05f5501 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml
@@ -38,7 +38,7 @@
.accept-group
.pull-left
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
- - unless @merge_request.disallow_source_branch_removal?
+ - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch)
.remove_branch_holder.pull-left
= label_tag :should_remove_source_branch, class: "checkbox" do
= check_box_tag :should_remove_source_branch
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml
index 435e916c6d..f1aaba2010 100644
--- a/app/views/projects/merge_requests/show/_mr_box.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_box.html.haml
@@ -1,6 +1,6 @@
.issue-box{ class: issue_box_class(@merge_request) }
.state.clearfix
- %span.state-label.col-sm-2.col-xs-12
+ .state-label
- if @merge_request.merged?
Merged
- elsif @merge_request.closed?
@@ -8,7 +8,7 @@
- else
Open
- %span.creator.col-sm-9.col-xs-12
+ .creator
Created by #{link_to_member(@project, @merge_request.author)} #{time_ago_with_tooltip(@merge_request.created_at)}
%h4.title
diff --git a/app/views/projects/merge_requests/show/_remove_source_branch.html.haml b/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
index f8f8b71f21..491360af1b 100644
--- a/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
+++ b/app/views/projects/merge_requests/show/_remove_source_branch.html.haml
@@ -1,7 +1,7 @@
- if @source_branch.blank?
Source branch has been removed
-- elsif @allowed_to_remove_source_branch && @merge_request.merged?
+- elsif can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && @merge_request.merged?
.remove_source_branch_widget
%p Changes merged into #{@merge_request.target_branch}. You can remove source branch now
= link_to project_branch_path(@merge_request.source_project, @source_branch), remote: true, method: :delete, class: "btn btn-primary btn-small remove_source_branch" do
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml
index d770bb5b37..979c27daa2 100644
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
@@ -21,8 +21,12 @@
.form-group
= f.label :description, "Description", class: "control-label"
.col-sm-10
- = f.text_area :description, maxlength: 2000, class: "form-control", rows: 10
- %p.hint Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
+ = f.text_area :description, maxlength: 2000, class: "form-control markdown-area", rows: 10
+ .hint
+ .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
+ .pull-left Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ .clearfix
+ .error-alert
.col-md-6
.form-group
= f.label :due_date, "Due Date", class: "control-label"
@@ -45,3 +49,5 @@
dateFormat: "yy-mm-dd",
onSelect: function(dateText, inst) { $("#milestone_due_date").val(dateText) }
}).datepicker("setDate", $.datepicker.parseDate('yy-mm-dd', $('#milestone_due_date').val()));
+
+ window.project_image_path_upload = "#{upload_image_project_path @project}";
diff --git a/app/views/projects/milestones/_issue.html.haml b/app/views/projects/milestones/_issue.html.haml
new file mode 100644
index 0000000000..08ccd0cdc8
--- /dev/null
+++ b/app/views/projects/milestones/_issue.html.haml
@@ -0,0 +1,9 @@
+%li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => project_issue_path(@project, issue) }
+ %span.str-truncated
+ = link_to [@project, issue] do
+ %span.cgray ##{issue.iid}
+ = link_to_gfm issue.title, [@project, issue]
+ .pull-right.assignee-icon
+ - if issue.assignee
+ = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
+
diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml
index c277dcc536..6e4df75a3d 100644
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
@@ -1,11 +1,6 @@
-.ui-box
- .title= title
- %ul.well-list
- - issues.each do |issue|
- %li
- = link_to [@project, issue] do
- %span.label{class: issue.closed? ? 'label-danger' : 'label-info'} ##{issue.iid}
- = link_to_gfm truncate(issue.title, length: 40), [@project, issue]
- - if issue.assignee
- .pull-right
- = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
+.panel.panel-default
+ .panel-heading= title
+ %ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id }
+ - issues.sort_by(&:position).each do |issue|
+ = render 'issue', issue: issue
+ %li.light.ui-sort-disabled Drag and drop available
diff --git a/app/views/projects/milestones/_merge_request.html.haml b/app/views/projects/milestones/_merge_request.html.haml
index faa35a25f2..d630c4518d 100644
--- a/app/views/projects/milestones/_merge_request.html.haml
+++ b/app/views/projects/milestones/_merge_request.html.haml
@@ -1,5 +1,5 @@
-%li
- = link_to [@project, merge_request] do
- %span.label.label-info ##{merge_request.iid}
- –
- = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
+%li{ id: dom_id(merge_request, 'sortable'), class: 'mr-row', 'data-iid' => merge_request.iid, 'data-url' => project_merge_request_path(@project, merge_request) }
+ %span.str-truncated
+ = link_to [@project, merge_request] do
+ %span.cgray ##{merge_request.iid}
+ = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request]
diff --git a/app/views/projects/milestones/_merge_requests.html.haml b/app/views/projects/milestones/_merge_requests.html.haml
new file mode 100644
index 0000000000..00889a5eb2
--- /dev/null
+++ b/app/views/projects/milestones/_merge_requests.html.haml
@@ -0,0 +1,6 @@
+.panel.panel-default
+ .panel-heading= title
+ %ul{ class: "well-list merge_requests-sortable-list", id: "merge_requests-list-#{id}", "data-state" => id }
+ - merge_requests.sort_by(&:position).each do |merge_request|
+ = render 'merge_request', merge_request: merge_request
+ %li.light.ui-sort-disabled Drag and drop available
diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml
index 3537650ad4..f0e48a5177 100644
--- a/app/views/projects/milestones/index.html.haml
+++ b/app/views/projects/milestones/index.html.haml
@@ -8,7 +8,9 @@
New Milestone
.row
- .col-md-3.hidden-sm
+ .fixed.sidebar-expand-button.hidden-lg.hidden-md.hidden-xs
+ %i.icon-list.icon-2x
+ .col-md-3.responsive-side
%ul.nav.nav-pills.nav-stacked
%li{class: ("active" if (params[:f] == "active" || !params[:f]))}
= link_to project_milestones_path(@project, f: "active") do
@@ -20,7 +22,7 @@
= link_to project_milestones_path(@project, f: "all") do
All
.col-md-9
- .ui-box
+ .panel.panel-default
%ul.well-list
= render @milestones
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 0fe5ac25b5..5cf7f33211 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -22,19 +22,25 @@
.issue-box{ class: issue_box_class(@milestone) }
.state.clearfix
- .state-label.col-sm-2.col-xs-12
+ .state-label
- if @milestone.closed?
Closed
- elsif @milestone.expired?
Expired
- else
Open
- %span.creator.col-sm-9.col-xs-12
+ .creator
= @milestone.expires_at
%h4.title
= gfm escape_once(@milestone.title)
+ - if @milestone.description.present?
+ .description
+ .wiki
+ = preserve do
+ = markdown @milestone.description
+
.context
%p
Progress:
@@ -45,11 +51,6 @@
.progress.progress-info
.progress-bar{style: "width: #{@milestone.percent_complete}%;"}
- - if @milestone.description.present?
- .description
- .wiki
- = preserve do
- = markdown @milestone.description
%ul.nav.nav-tabs
%li.active
@@ -75,25 +76,25 @@
.tab-pane.active#tab-issues
.row
.col-md-4
- = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned)
+ = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned, id: 'unassigned')
.col-md-4
- = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned)
+ = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned, id: 'ongoing')
.col-md-4
- = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed)
+ = render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed')
.tab-pane#tab-merge-requests
.row
- .col-md-6
- .ui-box
- .title Open
+ .col-md-3
+ = render('merge_requests', title: 'Work in progress (open and unassigned)', merge_requests: @merge_requests.opened.unassigned, id: 'unassigned')
+ .col-md-3
+ = render('merge_requests', title: 'Waiting for merge (open and assigned)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing')
+ .col-md-3
+ = render('merge_requests', title: 'Declined (closed)', merge_requests: @merge_requests.declined, id: 'closed')
+ .col-md-3
+ .panel.panel-primary
+ .panel-heading Merged
%ul.well-list
- - @merge_requests.opened.each do |merge_request|
- = render 'merge_request', merge_request: merge_request
- .col-md-6
- .ui-box
- .title Closed
- %ul.well-list
- - @merge_requests.closed.each do |merge_request|
+ - @merge_requests.merged.each do |merge_request|
= render 'merge_request', merge_request: merge_request
.tab-pane#tab-participants
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index d61ff789b6..415c98ec6a 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,15 +1,3 @@
-.row.append-bottom-20
- .col-md-2.append-bottom-10
- = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
- .col-md-10
- = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f|
- = label_tag :extended_sha1 , "Looking for", class: 'light inline-label'
- = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control input-mx-250"
- = button_tag type: 'submit', class: 'btn btn-success' do
- %i.icon-search
-
- .inline.prepend-left-20
- .checkbox.light
- = label_tag :filter_ref do
- = check_box_tag :filter_ref, 1, @options[:filter_ref]
- %span Begin with the selected commit
+.append-bottom-20
+ = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
+ .pull-right.visible-lg.light You can move around the graph by using the arrow keys.
diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml
index da0cfa84c2..5310822823 100644
--- a/app/views/projects/network/show.html.haml
+++ b/app/views/projects/network/show.html.haml
@@ -1,9 +1,18 @@
= render "head"
.project-network
- .tip
- You can move around the graph by using the arrow keys.
+ .controls
+ = form_tag project_network_path(@project, @id), method: :get, class: 'form-inline network-form' do |f|
+ = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: "search-input form-control input-mx-250"
+ = button_tag type: 'submit', class: 'btn btn-success' do
+ %i.icon-search
+ .inline.prepend-left-20
+ .checkbox.light
+ = label_tag :filter_ref do
+ = check_box_tag :filter_ref, 1, @options[:filter_ref]
+ %span Begin with the selected commit
+
.network-graph
- = spinner
+ = spinner nil, true
:javascript
new Network({
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index 3db551e993..b62aada3a9 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -5,26 +5,28 @@
= f.hidden_field :noteable_id
= f.hidden_field :noteable_type
- .note_text_and_preview.js-toggler-container
- %a.btn.js-note-preview-button.js-toggler-target.turn-off{ href: "javascript:;", data: {url: preview_project_notes_path(@project)} }
- %i.icon-eye-open
- Preview
- %a.btn.btn-primary.js-note-edit-button.js-toggler-target.turn-off{ href: "javascript:;" }
- %i.icon-edit
- Write
+ %ul.nav.nav-tabs
+ %li.active
+ = link_to '#note-write-holder', class: 'js-note-write-button' do
+ Write
+ %li
+ = link_to '#note-preview-holder', class: 'js-note-preview-button', data: { url: preview_project_notes_path(@project) } do
+ Preview
+ %div
+ .note-write-holder
+ = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input markdown-area'
- = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
- .note_preview.js-note-preview.turn-off
+ .light.clearfix
+ .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}
+ .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
- .hint
- .pull-right Comments are parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
- .clearfix
+ .note-preview-holder.hide
+ .js-note-preview
.note-form-actions
.buttons
= f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
= yield(:note_actions)
-
%a.btn.grouped.js-close-discussion-note-form Cancel
.note-form-option
@@ -35,4 +37,5 @@
%span.file_name.js-attachment-filename File name...
= f.file_field :attachment, class: "js-note-attachment-input hidden"
- .clearfix
+:javascript
+ window.project_image_path_upload = "#{upload_image_project_path @project}";
diff --git a/app/views/projects/protected_branches/index.html.haml b/app/views/projects/protected_branches/index.html.haml
index 4a6e8943a9..a51a4cc224 100644
--- a/app/views/projects/protected_branches/index.html.haml
+++ b/app/views/projects/protected_branches/index.html.haml
@@ -1,52 +1,50 @@
-= render "projects/commits/head"
-.row
- .col-md-3
- = render "projects/branches/filter"
- .col-md-9
- .bs-callout.bs-callout-info
- %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, class: "vlink"}.
- %p This ability allows:
- %ul
- %li keep stable branches secured
- %li forced code review before merge to protected branches
- %li prevents branch from force push
- %p Read more about project permissions #{link_to "here", help_permissions_path, class: "underlined-link"}
+%h3.page-title Protected branches
+%p.light This ability allows to keep stable branches secured and force code review before merge to protected branches
+%hr
- - if can? current_user, :admin_project, @project
- = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f|
- -if @protected_branch.errors.any?
- .alert.alert-danger
- %ul
- - @protected_branch.errors.full_messages.each do |msg|
- %li= msg
+.bs-callout.bs-callout-info
+ %p Protected branches designed to
+ %ul
+ %li prevent push for all except #{link_to "masters", help_page_path("permissions", "permissions"), class: "vlink"}.
+ %li prevent branch from force push
+ %li prevent branch from removal
+ %p Read more about project permissions #{link_to "here", help_page_path("permissions", "permissions"), class: "underlined-link"}
- .form-group
- = f.label :name, "Branch", class: 'control-label'
- .col-sm-10
- = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"})
- .form-actions
- = f.submit 'Protect', class: "btn-create btn"
- - unless @branches.empty?
- %h5 Already Protected:
- %ul.bordered-list.protected-branches-list
- - @branches.each do |branch|
- %li
- %h4
- = link_to project_commits_path(@project, branch.name) do
- %strong= branch.name
- - if @project.root_ref?(branch.name)
- %span.label.label-info default
- %span.label.label-success
- %i.icon-lock
- .pull-right
- - if can? current_user, :admin_project, @project
- = link_to 'Unprotect', [@project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-small"
+- if can? current_user, :admin_project, @project
+ = form_for [@project, @protected_branch], html: { class: 'form-horizontal' } do |f|
+ -if @protected_branch.errors.any?
+ .alert.alert-danger
+ %ul
+ - @protected_branch.errors.full_messages.each do |msg|
+ %li= msg
- - if commit = branch.commit
- = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
- = commit.short_id
- %span.light
- = gfm escape_once(truncate(commit.title, length: 40))
- #{time_ago_with_tooltip(commit.committed_date)}
- - else
- (branch was removed from repository)
+ .form-group
+ = f.label :name, "Branch", class: 'control-label'
+ .col-sm-10
+ = f.select(:name, @project.open_branches.map { |br| [br.name, br.name] } , {include_blank: "Select branch"}, {class: "select2"})
+ .form-actions
+ = f.submit 'Protect', class: "btn-create btn"
+- unless @branches.empty?
+ %h5 Already Protected:
+ %ul.bordered-list.protected-branches-list
+ - @branches.each do |branch|
+ %li
+ %h4
+ = link_to project_commits_path(@project, branch.name) do
+ %strong= branch.name
+ - if @project.root_ref?(branch.name)
+ %span.label.label-info default
+ %span.label.label-success
+ %i.icon-lock
+ .pull-right
+ - if can? current_user, :admin_project, @project
+ = link_to 'Unprotect', [@project, branch], data: { confirm: 'Branch will be writable for developers. Are you sure?' }, method: :delete, class: "btn btn-remove btn-small"
+
+ - if commit = branch.commit
+ = link_to project_commit_path(@project, commit.id), class: 'commit_short_id' do
+ = commit.short_id
+ %span.light
+ = gfm escape_once(truncate(commit.title, length: 40))
+ #{time_ago_with_tooltip(commit.committed_date)}
+ - else
+ (branch was removed from repository)
diff --git a/app/views/projects/refs/logs_tree.js.haml b/app/views/projects/refs/logs_tree.js.haml
index e7343e0997..948a21aa81 100644
--- a/app/views/projects/refs/logs_tree.js.haml
+++ b/app/views/projects/refs/logs_tree.js.haml
@@ -7,3 +7,13 @@
var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)}');
row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}');
+
+- if @logs.present?
+ :plain
+ var current_url = location.href.replace(/\/?$/, '/');
+ var log_url = '#{project_tree_url(@project, tree_join(@ref, @path || '/'))}'.replace(/\/?$/, '/');
+ if(current_url == log_url) {
+ // Load 10 more commit log for each file in tree
+ // if we still on the same page
+ ajaxGet('#{logs_file_project_ref_path(@project, @ref, @path || '/', offset: (@offset + @limit))}');
+ }
diff --git a/app/views/projects/repositories/stats.html.haml b/app/views/projects/repositories/stats.html.haml
index fd35397857..70db27d644 100644
--- a/app/views/projects/repositories/stats.html.haml
+++ b/app/views/projects/repositories/stats.html.haml
@@ -5,7 +5,7 @@
%hr
%p
%b Total commits:
- %span= @stats.commits_count
+ %span= @repository.commit_count
%p
%b Total files in #{@repository.root_ref}:
%span= @stats.files_count
diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index ddd8bbe457..f276024585 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -17,6 +17,9 @@
- @service.errors.full_messages.each do |msg|
%li= msg
+ - if @service.help.present?
+ .bs-callout
+ = @service.help
- if @service.help.present?
.bs-callout
diff --git a/app/views/projects/snippets/_blob.html.haml b/app/views/projects/snippets/_blob.html.haml
deleted file mode 100644
index af326a1a99..0000000000
--- a/app/views/projects/snippets/_blob.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-.file-holder
- .file-title
- %i.icon-file
- %strong= @snippet.file_name
- %span.options
- .btn-group.tree-btn-group.pull-right
- - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
- = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-tiny", title: 'Edit Snippet'
- = link_to "Raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-tiny", target: "_blank"
- = render 'snippets/blob_content'
diff --git a/app/views/projects/snippets/edit.html.haml b/app/views/projects/snippets/edit.html.haml
index e28b7d4937..f6a5bf9e4f 100644
--- a/app/views/projects/snippets/edit.html.haml
+++ b/app/views/projects/snippets/edit.html.haml
@@ -1 +1,4 @@
-= render "projects/snippets/form", url: project_snippet_path(@project, @snippet)
+%h3.page-title
+ Edit snippet
+%hr
+= render "shared/snippets/form", url: project_snippet_path(@project, @snippet)
diff --git a/app/views/projects/snippets/new.html.haml b/app/views/projects/snippets/new.html.haml
index 460af34f67..10f684b631 100644
--- a/app/views/projects/snippets/new.html.haml
+++ b/app/views/projects/snippets/new.html.haml
@@ -1 +1,4 @@
-= render "projects/snippets/form", url: project_snippets_path(@project, @snippet)
+%h3.page-title
+ New snippet
+%hr
+= render "shared/snippets/form", url: project_snippets_path(@project, @snippet)
diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml
index ac32f4866b..e4fdbd868c 100644
--- a/app/views/projects/snippets/show.html.haml
+++ b/app/views/projects/snippets/show.html.haml
@@ -1,11 +1,37 @@
%h3.page-title
= @snippet.title
- %small.pull-right
+ .pull-right
+ = link_to new_project_snippet_path(@project), class: "btn btn-new", title: "New Snippet" do
+ Add new snippet
+
+%hr
+
+.append-bottom-20
+ .pull-right
= "##{@snippet.id}"
%span.light
by
- = image_tag avatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
- = @snippet.author_name
-%div= render 'projects/snippets/blob'
+ = link_to user_path(@snippet.author) do
+ = image_tag avatar_icon(@snippet.author_email), class: "avatar avatar-inline s16"
+ = @snippet.author_name
+
+ .back-link
+ = link_to project_snippets_path(@project) do
+ ← project snippets
+
+.file-holder
+ .file-title
+ %i.icon-file
+ %span.file_name
+ = @snippet.file_name
+ .options
+ .btn-group
+ - if can?(current_user, :modify_project_snippet, @snippet)
+ = link_to "edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small", title: 'Edit Snippet'
+ = link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn btn-small", target: "_blank"
+ - if can?(current_user, :admin_project_snippet, @snippet)
+ = link_to "remove", project_snippet_path(@project, @snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-small btn-remove", title: 'Delete Snippet'
+ = render 'shared/snippets/blob'
+
%div#notes= render "projects/notes/notes_with_form"
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index 6629e47ad3..9ed737b181 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -5,18 +5,15 @@
%i.icon-tag
= tag.name
.pull-right
- %small.cdark
- %i.icon-calendar
- #{time_ago_with_tooltip(commit.committed_date)}
- %p.prepend-left-20
- = link_to commit.short_id(8), project_commit_path(@project, commit), class: "monospace"
- –
- = link_to_gfm truncate(commit.title, length: 70), project_commit_path(@project, commit.id), class: "cdark"
-
- %span.pull-right
- if can? current_user, :download_code, @project
= render 'projects/repositories/download_archive', ref: tag.name, btn_class: 'btn-grouped btn-group-small'
- if can?(current_user, :admin_project, @project)
- = link_to project_tag_path(@project, tag.name), class: 'btn btn-small remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do
+ = link_to project_tag_path(@project, tag.name), class: 'btn btn-small btn-remove remove-row grouped', method: :delete, data: { confirm: 'Removed tag cannot be restored. Are you sure?'}, remote: true do
%i.icon-trash
+ - if commit
+ %ul.list-unstyled
+ = render 'projects/commits/inline_commit', commit: commit, project: @project
+ - else
+ %p
+ Cant find HEAD commit for this tag
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 08122fb884..dc3188d43b 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -1,12 +1,14 @@
= render "projects/commits/head"
-- if can? current_user, :push_code, @project
- .pull-right
- = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do
- %i.icon-add-sign
- New tag
+%h3.page-title
+ Git Tags
+ - if can? current_user, :push_code, @project
+ .pull-right
+ = link_to new_project_tag_path(@project), class: 'btn btn-create new-tag-btn' do
+ %i.icon-add-sign
+ New tag
-%p
+%p.light
Tags give the ability to mark specific points in history as being important
%hr
diff --git a/app/views/projects/team_members/_group_members.html.haml b/app/views/projects/team_members/_group_members.html.haml
index eceec6627b..83c4b6f87d 100644
--- a/app/views/projects/team_members/_group_members.html.haml
+++ b/app/views/projects/team_members/_group_members.html.haml
@@ -1,6 +1,6 @@
- group_users_count = @group.users_groups.count
-.ui-box
- .title
+.panel.panel-default
+ .panel-heading
%strong #{@group.name}
group members (#{group_users_count})
.pull-right
diff --git a/app/views/projects/team_members/_team.html.haml b/app/views/projects/team_members/_team.html.haml
index 2daf684766..0e5b817613 100644
--- a/app/views/projects/team_members/_team.html.haml
+++ b/app/views/projects/team_members/_team.html.haml
@@ -1,7 +1,7 @@
.team-table
- can_admin_project = (can? current_user, :admin_project, @project)
- .ui-box
- .title
+ .panel.panel-default
+ .panel-heading
%strong #{@project.name}
project members (#{members.count})
%ul.well-list
diff --git a/app/views/projects/team_members/index.html.haml b/app/views/projects/team_members/index.html.haml
index 6eccaafe3d..ddb3b9d4a9 100644
--- a/app/views/projects/team_members/index.html.haml
+++ b/app/views/projects/team_members/index.html.haml
@@ -10,7 +10,7 @@
%p.light
Read more about project permissions
- %strong= link_to "here", help_permissions_path, class: "vlink"
+ %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
= render "team", members: @users_projects
- if @group
= render "group_members"
diff --git a/app/views/projects/tree/_blob_item.html.haml b/app/views/projects/tree/_blob_item.html.haml
index 6fee604b55..0971a42652 100644
--- a/app/views/projects/tree/_blob_item.html.haml
+++ b/app/views/projects/tree/_blob_item.html.haml
@@ -5,4 +5,4 @@
= link_to blob_item.name, project_blob_path(@project, tree_join(@id || @commit.id, blob_item.name))
%td.tree_time_ago.cgray
= render 'spinner'
- %td.tree_commit{ colspan: 2 }
+ %td.hidden-xs.tree_commit{ colspan: 2 }
diff --git a/app/views/projects/tree/_submodule_item.html.haml b/app/views/projects/tree/_submodule_item.html.haml
index ae87dbde67..474604df65 100644
--- a/app/views/projects/tree/_submodule_item.html.haml
+++ b/app/views/projects/tree/_submodule_item.html.haml
@@ -1,7 +1,7 @@
- tree, commit = submodule_links(submodule_item)
%tr{ class: "tree-item" }
%td.tree-item-file-name
- = image_tag "submodule.png"
+ %i.icon-archive
%span
= link_to truncate(submodule_item.name, length: 40), tree
@
@@ -11,5 +11,4 @@
- else
= link_to "#{submodule_item.id[0..10]}", commit
%td
- %td
- %td
+ %td.hidden-xs
diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml
index ee850e2bc1..84c3682d7a 100644
--- a/app/views/projects/tree/_tree.html.haml
+++ b/app/views/projects/tree/_tree.html.haml
@@ -1,6 +1,5 @@
-%ul.breadcrumb
+%ul.breadcrumb.repo-breadcrumb
%li
- %i.icon-angle-right
= link_to project_tree_path(@project, @ref) do
= @project.path
- tree_breadcrumbs(tree, 6) do |title, path|
@@ -9,11 +8,11 @@
= link_to truncate(title, length: 40), project_tree_path(@project, path)
- else
= link_to title, '#'
- - if current_user && @repository.branch_names.include?(@ref) && current_user.can?(:push_code, @project)
+ - if current_user && can_push_branch?(@project, @ref)
%li
= link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do
%small
- %i.icon-plus.light
+ %i.icon-plus
%div#tree-content-holder.tree-content-holder
%table#tree-slider{class: "table_#{@hex_path} tree-table" }
@@ -21,9 +20,9 @@
%tr
%th Name
%th Last Update
- %th.hidden-sm
- Last Commit
- %span.last-commit
+ %th.hidden-xs
+ .pull-left Last Commit
+ .last-commit.hidden-sm.pull-left
%i.icon-angle-right
@@ -31,16 +30,14 @@
= link_to @commit.short_id, project_commit_path(@project, @commit)
–
= truncate(@commit.title, length: 50)
- %th= link_to "history", project_commits_path(@project, @id), class: "pull-right"
+ = link_to "history", project_commits_path(@project, @id), class: "pull-right"
- if @path.present?
%tr.tree-item
%td.tree-item-file-name
- = image_tag "file_empty.png", size: '16x16'
- = link_to "..", project_tree_path(@project, up_dir_path(tree))
- %td
- %td
+ = link_to "..", project_tree_path(@project, up_dir_path(tree)), class: 'prepend-left-10'
%td
+ %td.hidden-xs
= render_tree(tree)
diff --git a/app/views/projects/tree/_tree_item.html.haml b/app/views/projects/tree/_tree_item.html.haml
index 1b3900bcba..760e95e84f 100644
--- a/app/views/projects/tree/_tree_item.html.haml
+++ b/app/views/projects/tree/_tree_item.html.haml
@@ -5,4 +5,4 @@
= link_to tree_item.name, project_tree_path(@project, tree_join(@id || @commit.id, tree_item.name))
%td.tree_time_ago.cgray
= render 'spinner'
- %td.tree_commit{ colspan: 2 }
+ %td.hidden-xs.tree_commit{ colspan: 2 }
diff --git a/app/views/projects/tree/show.html.haml b/app/views/projects/tree/show.html.haml
index 6b33493b7d..fc4616da6e 100644
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
@@ -1,6 +1,9 @@
-%div.tree-ref-holder
+.tree-ref-holder
= render 'shared/ref_switcher', destination: 'tree', path: @path
+
- if can? current_user, :download_code, @project
- = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-small tree-ref-holder pull-right', split_button: true
-%div#tree-holder.tree-holder
+ .tree-download-holder
+ = render 'projects/repositories/download_archive', ref: @ref, btn_class: 'btn-group-small pull-right hidden-xs hidden-sm', split_button: true
+
+#tree-holder.tree-holder.clearfix
= render "tree", tree: @tree
diff --git a/app/views/projects/walls/show.html.haml b/app/views/projects/walls/show.html.haml
deleted file mode 100644
index 3e3c7c4f8d..0000000000
--- a/app/views/projects/walls/show.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-%div.wall-page
- %ul.notes
-
- - if can? current_user, :write_note, @project
- .note-form-holder
- = form_for [@project, @note], remote: true, html: { multipart: true, id: nil, class: "new_note wall-note-form" }, authenticity_token: true do |f|
- = note_target_fields
- .note_text_and_preview
- = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input turn-on'
- .note-form-actions
- .buttons
- = f.submit 'Add Comment', class: "btn comment-btn btn-grouped js-comment-button"
-
- .note-form-option
- %a.choose-btn.btn.btn-small.js-choose-note-attachment-button
- %i.icon-paper-clip
- %span Choose File ...
-
- %span.file_name.js-attachment-filename File name...
- = f.file_field :attachment, class: "js-note-attachment-input hidden"
-
- .hint.pull-right CTRL + Enter to send message
- .clearfix
diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml
index 0c2e33f228..0a24e36ae8 100644
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
@@ -15,7 +15,6 @@
.col-sm-2
.col-sm-10
%p.cgray
- Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_markdown_path, target: '_blank'}.
To link to a (new) page you can just type
%code [Link Title](page-slug)
\.
@@ -23,8 +22,12 @@
.form-group
= f.label :content, class: 'control-label'
.col-sm-10
- = f.text_area :content, class: 'form-control js-gfm-input', rows: 18
-
+ = f.text_area :content, class: 'form-control js-gfm-input markdown-area', rows: 18
+ .col-sm-12.hint
+ .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}
+ .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.
+ .clearfix
+ .error-alert
.form-group
= f.label :commit_message, class: 'control-label'
.col-sm-10= f.text_field :message, class: 'form-control', rows: 18
@@ -36,3 +39,7 @@
- else
= f.submit 'Create page', class: "btn-create btn"
= link_to "Cancel", project_wiki_path(@project, :home), class: "btn btn-cancel"
+
+:javascript
+ window.project_image_path_upload = "#{upload_image_project_path @project}";
+
diff --git a/app/views/shared/_commit_message_container.html.haml b/app/views/shared/_commit_message_container.html.haml
index cca7a0efc9..4365947e70 100644
--- a/app/views/shared/_commit_message_container.html.haml
+++ b/app/views/shared/_commit_message_container.html.haml
@@ -1,5 +1,3 @@
.commit-message-container
.max-width-marker
- -# When the `ch` CSS length unit becomes widely supported `http://www.quirksmode.org/css/units-values` remove this workaround.
- = 'a' * 72
= textarea
diff --git a/app/views/shared/_file_hljs.html.haml b/app/views/shared/_file_hljs.html.haml
index 338236c075..ceee2c7527 100644
--- a/app/views/shared/_file_hljs.html.haml
+++ b/app/views/shared/_file_hljs.html.haml
@@ -8,5 +8,5 @@
= i
.highlight
%pre
- %code
+ %code{ class: highlightjs_class(blob.name) }
= blob.data
diff --git a/app/views/shared/_filter.html.haml b/app/views/shared/_filter.html.haml
index 0becf531cc..19ecc458e2 100644
--- a/app/views/shared/_filter.html.haml
+++ b/app/views/shared/_filter.html.haml
@@ -1,4 +1,4 @@
-.side-filters.hidden-xs.hidden-sm
+.side-filters
= form_tag filter_path(entity), method: 'get' do
- if current_user
%fieldset.scope-filter
diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml
index 087b6632e8..e976f897dc 100644
--- a/app/views/shared/_issues.html.haml
+++ b/app/views/shared/_issues.html.haml
@@ -1,8 +1,8 @@
- if @issues.any?
- @issues.group_by(&:project).each do |group|
- .ui-box.ui-box-small
+ .panel.panel-default.panel-small
- project = group[0]
- .title
+ .panel-heading
= link_to_project project
= link_to 'show all', project_issues_path(project), class: 'pull-right'
diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml
index f40b7be486..39a1ee38f8 100644
--- a/app/views/shared/_merge_requests.html.haml
+++ b/app/views/shared/_merge_requests.html.haml
@@ -1,8 +1,8 @@
- if @merge_requests.any?
- @merge_requests.group_by(&:target_project).each do |group|
- .ui-box.ui-box-small
+ .panel.panel-default.panel-small
- project = group[0]
- .title
+ .panel-heading
= link_to_project project
= link_to 'show all', project_merge_requests_path(project), class: 'pull-right'
%ul.well-list.mr-list
diff --git a/app/views/shared/_project_filter.html.haml b/app/views/shared/_project_filter.html.haml
index 7936a038be..743b4fba54 100644
--- a/app/views/shared/_project_filter.html.haml
+++ b/app/views/shared/_project_filter.html.haml
@@ -1,4 +1,4 @@
-.side-filters.hidden-xs.hidden-sm
+.side-filters
= form_tag project_entities_path, method: 'get' do
- if current_user
%fieldset
diff --git a/app/views/snippets/_blob_content.html.haml b/app/views/shared/snippets/_blob.html.haml
similarity index 100%
rename from app/views/snippets/_blob_content.html.haml
rename to app/views/shared/snippets/_blob.html.haml
diff --git a/app/views/projects/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml
similarity index 55%
rename from app/views/projects/snippets/_form.html.haml
rename to app/views/shared/snippets/_form.html.haml
index 866346990d..49ea8460e7 100644
--- a/app/views/projects/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
@@ -1,9 +1,6 @@
-%h3.page-title
- = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
-%hr
.snippet-form-holder
- = form_for [@project, @snippet], as: :project_snippet, url: url, html: {class: "form-horizontal snippet-form"} do |f|
- -if @snippet.errors.any?
+ = form_for @snippet, url: url, html: { class: "form-horizontal snippet-form" } do |f|
+ - if @snippet.errors.any?
.alert.alert-danger
%ul
- @snippet.errors.full_messages.each do |msg|
@@ -12,6 +9,23 @@
.form-group
= f.label :title, class: 'control-label'
.col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
+
+ - unless @snippet.respond_to?(:project)
+ .form-group
+ = f.label "Access", class: 'control-label'
+ .col-sm-10
+ = f.label :private_true, class: 'radio-label' do
+ = f.radio_button :private, true
+ %span
+ %strong Private
+ (only you can see this snippet)
+ %br
+ = f.label :private_false, class: 'radio-label' do
+ = f.radio_button :private, false
+ %span
+ %strong Public
+ (GitLab users can see this snippet)
+
.form-group
.file-editor
= f.label :file_name, "File", class: 'control-label'
@@ -29,14 +43,13 @@
- else
= f.submit 'Save', class: "btn-save btn"
- - unless @snippet.new_record?
- .pull-right.prepend-left-20
- = link_to 'Remove snippet', project_snippet_path(@project, @snippet), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn pull-right btn-remove delete-snippet prepend-left-10", id: "destroy_snippet_#{@snippet.id}"
- = link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel"
+ - if @snippet.respond_to?(:project)
+ = link_to "Cancel", project_snippets_path(@project), class: "btn btn-cancel"
+ - else
+ = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel"
:javascript
var editor = ace.edit("editor");
$(".snippet-form-holder form").submit(function(){
$(".snippet-file-content").val(editor.getValue());
});
-
diff --git a/app/views/snippets/_blob.html.haml b/app/views/snippets/_blob.html.haml
deleted file mode 100644
index 15867f071e..0000000000
--- a/app/views/snippets/_blob.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-.file-holder
- .file-title
- %i.icon-file
- %strong= @snippet.file_name
- %span.options
- .btn-group.tree-btn-group.pull-right
- - if @snippet.author == current_user
- = link_to "Edit", edit_snippet_path(@snippet), class: "btn btn-tiny", title: 'Edit Snippet'
- = link_to "Delete", snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-tiny", title: 'Delete Snippet'
- = link_to "Raw", raw_snippet_path(@snippet), class: "btn btn-tiny", target: "_blank"
- = render 'snippets/blob_content'
diff --git a/app/views/snippets/_form.html.haml b/app/views/snippets/_form.html.haml
deleted file mode 100644
index d466dc1af1..0000000000
--- a/app/views/snippets/_form.html.haml
+++ /dev/null
@@ -1,58 +0,0 @@
-%h3.page-title
- = @snippet.new_record? ? "New Snippet" : "Edit Snippet ##{@snippet.id}"
-%hr
-.snippet-form-holder
- = form_for @snippet, as: :personal_snippet, url: url, html: { class: "form-horizontal snippet-form" } do |f|
- -if @snippet.errors.any?
- .alert.alert-danger
- %ul
- - @snippet.errors.full_messages.each do |msg|
- %li= msg
-
- .form-group
- = f.label :title, class: 'control-label'
- .col-sm-10= f.text_field :title, placeholder: "Example Snippet", class: 'form-control', required: true
- .form-group
- = f.label "Access", class: 'control-label'
- .col-sm-10
- = f.label :private_true, class: 'radio-label' do
- = f.radio_button :private, true
- %span
- %strong Private
- (only you can see this snippet)
- %br
- = f.label :private_false, class: 'radio-label' do
- = f.radio_button :private, false
- %span
- %strong Public
- (GitLab users can see this snippet)
-
- .form-group
- .file-editor
- = f.label :file_name, "File", class: 'control-label'
- .col-sm-10
- .file-holder.snippet
- .file-title
- = f.text_field :file_name, placeholder: "example.rb", class: 'form-control snippet-file-name', required: true
- .file-content.code
- %pre#editor= @snippet.content
- = f.hidden_field :content, class: 'snippet-file-content'
-
- .form-actions
- - if @snippet.new_record?
- = f.submit 'Create snippet', class: "btn-create btn"
- - else
- = f.submit 'Save', class: "btn-save btn"
-
- - unless @snippet.new_record?
- .pull-right.prepend-left-20
- = link_to 'Remove', snippet_path(@snippet), data: { confirm: 'Removed snippet cannot be restored! Are you sure?'}, method: :delete, class: "btn btn-remove delete-snippet", id: "destroy_snippet_#{@snippet.id}"
- = link_to "Cancel", snippets_path(@project), class: "btn btn-cancel"
-
-
-:javascript
- var editor = ace.edit("editor");
- $(".snippet-form-holder form").submit(function(){
- $(".snippet-file-content").val(editor.getValue());
- });
-
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 90ddc7198f..e3edd85698 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -18,16 +18,16 @@
All
%span.pull-right
= @user.snippets.count
- = nav_tab :scope, 'private' do
- = link_to user_snippets_path(@user, scope: 'private') do
+ = nav_tab :scope, 'are_private' do
+ = link_to user_snippets_path(@user, scope: 'are_private') do
Private
%span.pull-right
- = @user.snippets.private.count
- = nav_tab :scope, 'public' do
- = link_to user_snippets_path(@user, scope: 'public') do
+ = @user.snippets.are_private.count
+ = nav_tab :scope, 'are_public' do
+ = link_to user_snippets_path(@user, scope: 'are_public') do
Public
%span.pull-right
- = @user.snippets.public.count
+ = @user.snippets.are_public.count
.col-md-9.my-snippets
= render 'snippets'
diff --git a/app/views/snippets/edit.html.haml b/app/views/snippets/edit.html.haml
index 1b88a85faf..7042d07d5e 100644
--- a/app/views/snippets/edit.html.haml
+++ b/app/views/snippets/edit.html.haml
@@ -1 +1,4 @@
-= render "snippets/form", url: snippet_path(@snippet)
+%h3.page-title
+ Edit snippet
+%hr
+= render "shared/snippets/form", url: snippet_path(@snippet)
diff --git a/app/views/snippets/new.html.haml b/app/views/snippets/new.html.haml
index 90e0a1f79d..694d705831 100644
--- a/app/views/snippets/new.html.haml
+++ b/app/views/snippets/new.html.haml
@@ -1 +1,4 @@
-= render "snippets/form", url: snippets_path(@snippet)
+%h3.page-title
+ New snippet
+%hr
+= render "shared/snippets/form", url: snippets_path(@snippet)
diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index a680e5eb5b..1d2e3d5ae4 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -7,9 +7,9 @@
private
.pull-right
- = link_to new_snippet_path, class: "btn btn-new btn-small", title: "New Snippet" do
+ = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
Add new snippet
-
+%hr
.append-bottom-20
.pull-right
@@ -28,4 +28,16 @@
= link_to snippets_path do
← discover snippets
-%div= render 'blob'
+.file-holder
+ .file-title
+ %i.icon-file
+ %span.file_name
+ = @snippet.file_name
+ .options
+ .btn-group
+ - if can?(current_user, :modify_personal_snippet, @snippet)
+ = link_to "edit", edit_snippet_path(@snippet), class: "btn btn-small", title: 'Edit Snippet'
+ = link_to "raw", raw_snippet_path(@snippet), class: "btn btn-small", target: "_blank"
+ - if can?(current_user, :admin_personal_snippet, @snippet)
+ = link_to "remove", snippet_path(@snippet), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-small btn-remove", title: 'Delete Snippet'
+ = render 'shared/snippets/blob'
diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml
index 7ffd43e837..3b44959baa 100644
--- a/app/views/users/_profile.html.haml
+++ b/app/views/users/_profile.html.haml
@@ -1,5 +1,5 @@
-.ui-box
- .title
+.panel.panel-default
+ .panel-heading
Profile
%ul.well-list
%li
diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml
index a61c6ba5b8..1d38f8e8ab 100644
--- a/app/views/users/_projects.html.haml
+++ b/app/views/users/_projects.html.haml
@@ -1,6 +1,6 @@
-.ui-box
- .title Projects
+.panel.panel-default
+ .panel-heading Personal projects
%ul.well-list
- - @projects.each do |project|
+ - projects.each do |project|
%li
= link_to_project project
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index edcaf3acf9..60159a29b9 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -13,11 +13,14 @@
%br
%small member since #{@user.created_at.stamp("Nov 12, 2031")}
.clearfix
- %h4 Groups:
- = render 'groups', groups: @groups
- %hr
+
+ - if @groups.any?
+ %h4 Groups:
+ = render 'groups', groups: @groups
+ %hr
%h4 User Activity:
= render @events
.col-md-4
= render 'profile', user: @user
- = render 'projects'
+ - if @projects.present?
+ = render 'projects', projects: @projects
diff --git a/script/background_jobs b/bin/background_jobs
similarity index 96%
rename from script/background_jobs
rename to bin/background_jobs
index e0140e9689..c7ba4398cf 100755
--- a/script/background_jobs
+++ b/bin/background_jobs
@@ -18,7 +18,7 @@ function stop
function killall
{
- pkill -u $gitlab_user -f sidekiq
+ pkill -u $gitlab_user -f 'sidekiq [0-9]'
}
function restart
diff --git a/script/check b/bin/check
similarity index 100%
rename from script/check
rename to bin/check
diff --git a/script/upgrade.rb b/bin/upgrade.rb
similarity index 100%
rename from script/upgrade.rb
rename to bin/upgrade.rb
diff --git a/script/web b/bin/web
similarity index 100%
rename from script/web
rename to bin/web
diff --git a/config/application.rb b/config/application.rb
index f087d3507b..540426b667 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -19,8 +19,7 @@ module Gitlab
# config.plugins = [ :exception_notification, :ssl_requirement, :all ]
# Activate observers that should always be running.
- config.active_record.observers = :milestone_observer,
- :project_activity_cache_observer,
+ config.active_record.observers = :project_activity_cache_observer,
:note_observer,
:project_observer,
:system_hook_observer,
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 47f7e17aeb..2450d5719e 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -74,10 +74,6 @@ Gitlab::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
- # Log the query plan for queries taking more than this (works
- # with SQLite, MySQL, and PostgreSQL)
- # config.active_record.auto_explain_threshold_in_seconds = 0.5
-
config.action_mailer.delivery_method = :sendmail
# Defaults to:
# # config.action_mailer.sendmail_settings = {
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 5100cc4979..22353972a3 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -35,8 +35,7 @@ production: &base
# Email address used in the "From" field in mails sent by GitLab
email_from: example@example.com
- # Email address of your support contact (default: same as email_from)
- support_email: support@example.com
+ # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
## User settings
default_projects_limit: 10
@@ -74,7 +73,6 @@ production: &base
issues: true
merge_requests: true
wiki: true
- wall: false
snippets: false
visibility_level: "private" # can be "private" | "internal" | "public"
@@ -116,8 +114,8 @@ production: &base
gravatar:
enabled: true # Use user avatar image from Gravatar.com (default: true)
# gravatar urls: possible placeholders: %{hash} %{size} %{email}
- # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
- # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
+ # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
+ # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
#
# 2. Auth settings
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 299dd8cab7..dfa28d4b04 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -79,7 +79,6 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
-Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'
Settings.gitlab['user_home'] ||= begin
@@ -96,7 +95,6 @@ Settings.gitlab['default_projects_features'] ||= {}
Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil?
Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?
Settings.gitlab.default_projects_features['wiki'] = true if Settings.gitlab.default_projects_features['wiki'].nil?
-Settings.gitlab.default_projects_features['wall'] = false if Settings.gitlab.default_projects_features['wall'].nil?
Settings.gitlab.default_projects_features['snippets'] = false if Settings.gitlab.default_projects_features['snippets'].nil?
Settings.gitlab.default_projects_features['visibility_level'] = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitlab['repository_downloads_path'] || 'tmp/repositories', Rails.root)
@@ -106,8 +104,8 @@ Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitla
#
Settings['gravatar'] ||= Settingslogic.new({})
Settings.gravatar['enabled'] = true if Settings.gravatar['enabled'].nil?
-Settings.gravatar['plain_url'] ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
-Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
+Settings.gravatar['plain_url'] ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
+Settings.gravatar['ssl_url'] ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
#
# GitLab Shell
diff --git a/config/initializers/acts_as_taggable_on_patch.rb b/config/initializers/acts_as_taggable_on_patch.rb
new file mode 100644
index 0000000000..baa77fde39
--- /dev/null
+++ b/config/initializers/acts_as_taggable_on_patch.rb
@@ -0,0 +1,130 @@
+# This is a patch to address the issue in https://github.com/mbleigh/acts-as-taggable-on/issues/427 caused by
+# https://github.com/rails/rails/commit/31a43ebc107fbd50e7e62567e5208a05909ec76c
+# gem 'acts-as-taggable-on' has the fix included https://github.com/mbleigh/acts-as-taggable-on/commit/89bbed3864a9252276fb8dd7d535fce280454b90
+# but not in the currently used version of gem ('2.4.1')
+# With replacement of 'acts-as-taggable-on' gem this file will become obsolete
+
+module ActsAsTaggableOn::Taggable
+ module Core
+ module ClassMethods
+ def tagged_with(tags, options = {})
+ tag_list = ActsAsTaggableOn::TagList.from(tags)
+ empty_result = where("1 = 0")
+
+ return empty_result if tag_list.empty?
+
+ joins = []
+ conditions = []
+ having = []
+ select_clause = []
+
+ context = options.delete(:on)
+ owned_by = options.delete(:owned_by)
+ alias_base_name = undecorated_table_name.gsub('.','_')
+ quote = ActsAsTaggableOn::Tag.using_postgresql? ? '"' : ''
+
+ if options.delete(:exclude)
+ if options.delete(:wild)
+ tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name #{like_operator} ? ESCAPE '!'", "%#{escape_like(t)}%"]) }.join(" OR ")
+ else
+ tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name #{like_operator} ?", t]) }.join(" OR ")
+ end
+
+ conditions << "#{table_name}.#{primary_key} NOT IN (SELECT #{ActsAsTaggableOn::Tagging.table_name}.taggable_id FROM #{ActsAsTaggableOn::Tagging.table_name} JOIN #{ActsAsTaggableOn::Tag.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.#{ActsAsTaggableOn::Tag.primary_key} AND (#{tags_conditions}) WHERE #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name, nil)})"
+
+ if owned_by
+ joins << "JOIN #{ActsAsTaggableOn::Tagging.table_name}" +
+ " ON #{ActsAsTaggableOn::Tagging.table_name}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
+ " AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name, nil)}" +
+ " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_id = #{owned_by.id}" +
+ " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_type = #{quote_value(owned_by.class.base_class.to_s, nil)}"
+ end
+
+ elsif options.delete(:any)
+ # get tags, drop out if nothing returned (we need at least one)
+ tags = if options.delete(:wild)
+ ActsAsTaggableOn::Tag.named_like_any(tag_list)
+ else
+ ActsAsTaggableOn::Tag.named_any(tag_list)
+ end
+
+ return empty_result unless tags.length > 0
+
+ # setup taggings alias so we can chain, ex: items_locations_taggings_awesome_cool_123
+ # avoid ambiguous column name
+ taggings_context = context ? "_#{context}" : ''
+
+ taggings_alias = adjust_taggings_alias(
+ "#{alias_base_name[0..4]}#{taggings_context[0..6]}_taggings_#{sha_prefix(tags.map(&:name).join('_'))}"
+ )
+
+ tagging_join = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
+ " ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
+ " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}"
+ tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
+
+ # don't need to sanitize sql, map all ids and join with OR logic
+ conditions << tags.map { |t| "#{taggings_alias}.tag_id = #{t.id}" }.join(" OR ")
+ select_clause = "DISTINCT #{table_name}.*" unless context and tag_types.one?
+
+ if owned_by
+ tagging_join << " AND " +
+ sanitize_sql([
+ "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
+ owned_by.id,
+ owned_by.class.base_class.to_s
+ ])
+ end
+
+ joins << tagging_join
+ else
+ tags = ActsAsTaggableOn::Tag.named_any(tag_list)
+
+ return empty_result unless tags.length == tag_list.length
+
+ tags.each do |tag|
+ taggings_alias = adjust_taggings_alias("#{alias_base_name[0..11]}_taggings_#{sha_prefix(tag.name)}")
+ tagging_join = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
+ " ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
+ " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}" +
+ " AND #{taggings_alias}.tag_id = #{tag.id}"
+
+ tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
+
+ if owned_by
+ tagging_join << " AND " +
+ sanitize_sql([
+ "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
+ owned_by.id,
+ owned_by.class.base_class.to_s
+ ])
+ end
+
+ joins << tagging_join
+ end
+ end
+
+ taggings_alias, tags_alias = adjust_taggings_alias("#{alias_base_name}_taggings_group"), "#{alias_base_name}_tags_group"
+
+ if options.delete(:match_all)
+ joins << "LEFT OUTER JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
+ " ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
+ " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}"
+
+
+ group_columns = ActsAsTaggableOn::Tag.using_postgresql? ? grouped_column_names_for(self) : "#{table_name}.#{primary_key}"
+ group = group_columns
+ having = "COUNT(#{taggings_alias}.taggable_id) = #{tags.size}"
+ end
+
+ select(select_clause) \
+ .joins(joins.join(" ")) \
+ .where(conditions.join(" AND ")) \
+ .group(group) \
+ .having(having) \
+ .order(options[:order]) \
+ .readonly(false)
+ end
+ end
+ end
+end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index d5cb110e88..50669ece7a 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -223,7 +223,6 @@ Devise.setup do |config|
method: Gitlab.config.ldap['method'],
bind_dn: Gitlab.config.ldap['bind_dn'],
password: Gitlab.config.ldap['password'],
- filter: Gitlab.config.ldap['user_filter'],
name_proc: email_stripping_proc
end
@@ -245,4 +244,4 @@ Devise.setup do |config|
config.omniauth provider['name'].to_sym, *provider_arguments
end
-end
\ No newline at end of file
+end
diff --git a/config/initializers/state_machine_patch.rb b/config/initializers/state_machine_patch.rb
new file mode 100644
index 0000000000..72d010fa5d
--- /dev/null
+++ b/config/initializers/state_machine_patch.rb
@@ -0,0 +1,9 @@
+# This is a patch to address the issue in https://github.com/pluginaweek/state_machine/issues/251
+# where gem 'state_machine' was not working for Rails 4.1
+module StateMachine
+ module Integrations
+ module ActiveModel
+ public :around_validation
+ end
+ end
+end
diff --git a/config/routes.rb b/config/routes.rb
index c9bb880c15..b4d6ef837b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,19 +31,10 @@ Gitlab::Application.routes.draw do
#
# Help
#
- get 'help' => 'help#index'
- get 'help/api' => 'help#api'
- get 'help/api/:category' => 'help#api', as: 'help_api_file'
- get 'help/markdown' => 'help#markdown'
- get 'help/permissions' => 'help#permissions'
- get 'help/public_access' => 'help#public_access'
- get 'help/raketasks' => 'help#raketasks'
- get 'help/ssh' => 'help#ssh'
- get 'help/system_hooks' => 'help#system_hooks'
- get 'help/web_hooks' => 'help#web_hooks'
- get 'help/workflow' => 'help#workflow'
+
+ get 'help' => 'help#index'
+ get 'help/:category/:file' => 'help#show', as: :help_page
get 'help/shortcuts'
- get 'help/security'
#
# Global snippets
@@ -142,8 +133,6 @@ Gitlab::Application.routes.draw do
match "/u/:username" => "users#show", as: :user, constraints: { username: /.*/ }, via: :get
-
-
#
# Dashboard Area
#
@@ -163,6 +152,7 @@ Gitlab::Application.routes.draw do
get :issues
get :merge_requests
get :members
+ get :projects
end
scope module: :groups do
@@ -192,6 +182,7 @@ Gitlab::Application.routes.draw do
post :fork
post :archive
post :unarchive
+ post :upload_image
get :autocomplete_sources
get :import
put :retry_import
@@ -232,12 +223,6 @@ Gitlab::Application.routes.draw do
end
end
- resource :wall, only: [:show], constraints: {id: /\d+/} do
- member do
- get 'notes'
- end
- end
-
resource :repository, only: [:show] do
member do
get "stats"
@@ -258,12 +243,7 @@ Gitlab::Application.routes.draw do
end
end
- resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } do
- collection do
- get :recent, constraints: { id: Gitlab::Regex.git_reference_regex }
- end
- end
-
+ resources :branches, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
resources :tags, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
resources :protected_branches, only: [:index, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
@@ -308,7 +288,12 @@ Gitlab::Application.routes.draw do
end
resources :team, controller: 'team_members', only: [:index]
- resources :milestones, except: [:destroy], constraints: {id: /\d+/}
+ resources :milestones, except: [:destroy], constraints: {id: /\d+/} do
+ member do
+ put :sort_issues
+ put :sort_merge_requests
+ end
+ end
resources :labels, only: [:index] do
collection do
@@ -347,7 +332,7 @@ Gitlab::Application.routes.draw do
end
end
- get ':id' => "groups#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
+ get ':id' => "namespaces#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
root to: "dashboard#show"
end
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index f6c0f09b51..e88a452233 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -34,6 +34,20 @@ listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 64
listen "127.0.0.1:8080", :tcp_nopush => true
# nuke workers after 30 seconds instead of 60 seconds (the default)
+#
+# NOTICE: git push over http depends on this value.
+# If you want be able to push huge amount of data to git repository over http
+# you will have to increase this value too.
+#
+# Example of output if you try to push 1GB repo to GitLab over http.
+# -> git push http://gitlab.... master
+#
+# error: RPC failed; result=18, HTTP code = 200
+# fatal: The remote end hung up unexpectedly
+# fatal: The remote end hung up unexpectedly
+#
+# For more information see http://stackoverflow.com/a/21682112/752049
+#
timeout 30
# feel free to point this anywhere accessible on the filesystem
diff --git a/db/fixtures/development/12_snippets.rb b/db/fixtures/development/12_snippets.rb
index dced270626..ff91e8430a 100644
--- a/db/fixtures/development/12_snippets.rb
+++ b/db/fixtures/development/12_snippets.rb
@@ -1,8 +1,8 @@
Gitlab::Seeder.quiet do
contents = [
- `curl https://gist.github.com/randx/4275756/raw/da2f262920c96d1a970d48bf2e99147954b1f4bd/glus1204.sh`,
- `curl https://gist.github.com/randx/3754594/raw/11026a295e6ef3a151c635707a3e1e8e15fc4725/gitlab_setup.sh `,
- `curl https://gist.github.com/randx/3065552/raw/29fbd09f4605a5ea22a5a9095e35fd1938dea4d6/gistfile1.sh`,
+ `curl https://gist.githubusercontent.com/randx/4275756/raw/da2f262920c96d1a970d48bf2e99147954b1f4bd/glus1204.sh`,
+ `curl https://gist.githubusercontent.com/randx/3754594/raw/11026a295e6ef3a151c635707a3e1e8e15fc4725/gitlab_setup.sh`,
+ `curl https://gist.githubusercontent.com/randx/3065552/raw/29fbd09f4605a5ea22a5a9095e35fd1938dea4d6/gistfile1.sh`,
]
(1..50).each do |i|
diff --git a/db/migrate/20140611135229_add_position_to_merge_request.rb b/db/migrate/20140611135229_add_position_to_merge_request.rb
new file mode 100644
index 0000000000..d5fdecd0c3
--- /dev/null
+++ b/db/migrate/20140611135229_add_position_to_merge_request.rb
@@ -0,0 +1,5 @@
+class AddPositionToMergeRequest < ActiveRecord::Migration
+ def change
+ add_column :merge_requests, :position, :integer, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3ba95c633c..bdf35c8945 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140513095908) do
+ActiveRecord::Schema.define(version: 20140611135229) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -140,9 +140,9 @@ ActiveRecord::Schema.define(version: 20140513095908) do
add_index "merge_request_diffs", ["merge_request_id"], name: "index_merge_request_diffs_on_merge_request_id", unique: true, using: :btree
create_table "merge_requests", force: true do |t|
- t.string "target_branch", null: false
- t.string "source_branch", null: false
- t.integer "source_project_id", null: false
+ t.string "target_branch", null: false
+ t.string "source_branch", null: false
+ t.integer "source_project_id", null: false
t.integer "author_id"
t.integer "assignee_id"
t.string "title"
@@ -151,9 +151,10 @@ ActiveRecord::Schema.define(version: 20140513095908) do
t.integer "milestone_id"
t.string "state"
t.string "merge_status"
- t.integer "target_project_id", null: false
+ t.integer "target_project_id", null: false
t.integer "iid"
t.text "description"
+ t.integer "position", default: 0
end
add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree
diff --git a/doc/README.md b/doc/README.md
index b73d7bb38e..f05078ee38 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,24 +1,26 @@
-**User documentation**
+# Documentation
-+ [API](api/README.md) Explore how you can access GitLab via a simple and powerful API.
-+ [Markdown](markdown/markdown.md) Learn what you can do with GitLab's advanced formatting system.
-+ [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do.
-+ [Public access](public_access/public_access.md) Learn how you can allow public and internal access to a project.
-+ [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
-+ [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
-+ [Workflow](workflow/README.md) Learn how to use Git and GitLab together.
+## User documentation
-**Administrator documentation**
+- [API](api/README.md) Explore how you can access GitLab via a simple and powerful API.
+- [Markdown](markdown/markdown.md) Learn what you can do with GitLab's advanced formatting system.
+- [Permissions](permissions/permissions.md) Learn what each role in a project (guest/reporter/developer/master/owner) can do.
+- [Public access](public_access/public_access.md) Learn how you can allow public and internal access to a project.
+- [SSH](ssh/README.md) Setup your ssh keys and deploy keys for secure access to your projects.
+- [Web hooks](web_hooks/web_hooks.md) Let GitLab notify you when new code has been pushed to your project.
+- [Workflow](workflow/README.md) Learn how to use Git and GitLab together.
-+ [Install](install/README.md) Requirements, directory structures and manual installation.
-+ [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
-+ [Raketasks](raketasks/README.md) Explore what GitLab has in store for you to make administration easier.
-+ [System hooks](system_hooks/system_hooks.md) Let GitLab notify you when certain management tasks need to be carried out.
-+ [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
-+ [Update](update/README.md) Update guides to upgrade your installation.
+## Administrator documentation
-**Contributor documentation**
+- [Install](install/README.md) Requirements, directory structures and manual installation.
+- [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter.
+- [Raketasks](raketasks/README.md) Explore what GitLab has in store for you to make administration easier.
+- [System hooks](system_hooks/system_hooks.md) Let GitLab notify you when certain management tasks need to be carried out.
+- [Security](security/README.md) Learn what you can do to further secure your GitLab instance.
+- [Update](update/README.md) Update guides to upgrade your installation.
-+ [Development](development/README.md) Explains the architecture and the guidelines for shell commands.
-+ [Legal](legal/README.md) Contributor license agreements.
-+ [Release](release/README.md) How to make the monthly and security releases.
+## Contributor documentation
+
+- [Development](development/README.md) Explains the architecture and the guidelines for shell commands.
+- [Legal](legal/README.md) Contributor license agreements.
+- [Release](release/README.md) How to make the monthly and security releases.
diff --git a/doc/api/README.md b/doc/api/README.md
index acd2f524be..e91d3af59d 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -2,31 +2,31 @@
## Resources
-+ [Users](users.md)
-+ [Session](session.md)
-+ [Projects](projects.md)
-+ [Project Snippets](project_snippets.md)
-+ [Repositories](repositories.md)
-+ [Repository Files](repository_files.md)
-+ [Commits](commits.md)
-+ [Branches](branches.md)
-+ [Merge Requests](merge_requests.md)
-+ [Issues](issues.md)
-+ [Milestones](milestones.md)
-+ [Notes](notes.md) (comments)
-+ [Deploy Keys](deploy_keys.md)
-+ [System Hooks](system_hooks.md)
-+ [Groups](groups.md)
+- [Users](users.md)
+- [Session](session.md)
+- [Projects](projects.md)
+- [Project Snippets](project_snippets.md)
+- [Repositories](repositories.md)
+- [Repository Files](repository_files.md)
+- [Commits](commits.md)
+- [Branches](branches.md)
+- [Merge Requests](merge_requests.md)
+- [Issues](issues.md)
+- [Milestones](milestones.md)
+- [Notes](notes.md) (comments)
+- [Deploy Keys](deploy_keys.md)
+- [System Hooks](system_hooks.md)
+- [Groups](groups.md)
## Clients
-+ [php-gitlab-api](https://github.com/m4tthumphrey/php-gitlab-api) - PHP
-+ [Laravel API Wrapper for GitLab CE](https://github.com/adamgoose/gitlab) - PHP / [Laravel](http://laravel.com)
-+ [Ruby Wrapper](https://github.com/NARKOZ/gitlab) - Ruby
-+ [python-gitlab](https://github.com/Itxaka/python-gitlab) - Python
-+ [java-gitlab-api](https://github.com/timols/java-gitlab-api) - Java
-+ [node-gitlab](https://github.com/moul/node-gitlab) - Node.js
-+ [NGitLab](https://github.com/Scooletz/NGitLab) - .NET
+- [php-gitlab-api](https://github.com/m4tthumphrey/php-gitlab-api) - PHP
+- [Laravel API Wrapper for GitLab CE](https://github.com/adamgoose/gitlab) - PHP / [Laravel](http://laravel.com)
+- [Ruby Wrapper](https://github.com/NARKOZ/gitlab) - Ruby
+- [python-gitlab](https://github.com/Itxaka/python-gitlab) - Python
+- [java-gitlab-api](https://github.com/timols/java-gitlab-api) - Java
+- [node-gitlab](https://github.com/moul/node-gitlab) - Node.js
+- [NGitLab](https://github.com/Scooletz/NGitLab) - .NET
## Introduction
@@ -54,41 +54,35 @@ Example for a valid API request using curl and authentication via header:
curl --header "PRIVATE-TOKEN: QVy1PB7sTxfy4pqfZM1U" "http://example.com/api/v3/projects"
```
-
The API uses JSON to serialize data. You don't need to specify `.json` at the end of API URL.
-
-
## Status codes
-The API is designed to return different status codes according to context and action. In this way
-if a request results in an error the caller is able to get insight into what went wrong, e.g.
-status code `400 Bad Request` is returned if a required attribute is missing from the request.
-The following list gives an overview of how the API functions generally behave.
+The API is designed to return different status codes according to context and action. In this way if a request results in an error the caller is able to get insight into what went wrong, e.g. status code `400 Bad Request` is returned if a required attribute is missing from the request. The following list gives an overview of how the API functions generally behave.
API request types:
-* `GET` requests access one or more resources and return the result as JSON
-* `POST` requests return `201 Created` if the resource is successfully created and return the newly created resource as JSON
-* `GET`, `PUT` and `DELETE` return `200 Ok` if the resource is accessed, modified or deleted successfully, the (modified) result is returned as JSON
-* `DELETE` requests are designed to be idempotent, meaning a request a resource still returns `200 Ok` even it was deleted before or is not available. The reasoning behind it is the user is not really interested if the resource existed before or not.
-
+- `GET` requests access one or more resources and return the result as JSON
+- `POST` requests return `201 Created` if the resource is successfully created and return the newly created resource as JSON
+- `GET`, `PUT` and `DELETE` return `200 Ok` if the resource is accessed, modified or deleted successfully, the (modified) result is returned as JSON
+- `DELETE` requests are designed to be idempotent, meaning a request a resource still returns `200 Ok` even it was deleted before or is not available. The reasoning behind it is the user is not really interested if the resource existed before or not.
The following list shows the possible return codes for API requests.
Return values:
-* `200 Ok` - The `GET`, `PUT` or `DELETE` request was successful, the resource(s) itself is returned as JSON
-* `201 Created` - The `POST` request was successful and the resource is returned as JSON
-* `400 Bad Request` - A required attribute of the API request is missing, e.g. the title of an issue is not given
-* `401 Unauthorized` - The user is not authenticated, a valid user token is necessary, see above
-* `403 Forbidden` - The request is not allowed, e.g. the user is not allowed to delete a project
-* `404 Not Found` - A resource could not be accessed, e.g. an ID for a resource could not be found
-* `405 Method Not Allowed` - The request is not supported
-* `409 Conflict` - A conflicting resource already exists, e.g. creating a project with a name that already exists
-* `500 Server Error` - While handling the request something went wrong on the server side
+- `200 Ok` - The `GET`, `PUT` or `DELETE` request was successful, the resource(s) itself is returned as JSON
+- `201 Created` - The `POST` request was successful and the resource is returned as JSON
+- `400 Bad Request` - A required attribute of the API request is missing, e.g. the title of an issue is not given
+- `401 Unauthorized` - The user is not authenticated, a valid user token is necessary, see above
+- `403 Forbidden` - The request is not allowed, e.g. the user is not allowed to delete a project
+- `404 Not Found` - A resource could not be accessed, e.g. an ID for a resource could not be found
+- `405 Method Not Allowed` - The request is not supported
+- `409 Conflict` - A conflicting resource already exists, e.g. creating a project with a name that already exists
+- `500 Server Error` - While handling the request something went wrong on the server side
## Sudo
+
All API requests support performing an api call as if you were another user, if your private token is for an administration account. You need to pass `sudo` parameter by url or header with an id or username of the user you want to perform the operation as. If passed as header, the header name must be "SUDO" (capitals).
If a non administrative `private_token` is provided then an error message will be returned with status code 403:
@@ -112,16 +106,17 @@ Example of a valid API with sudo request:
```
GET http://example.com/api/v3/projects?private_token=QVy1PB7sTxfy4pqfZM1U&sudo=username
```
+
```
GET http://example.com/api/v3/projects?private_token=QVy1PB7sTxfy4pqfZM1U&sudo=23
```
-
Example for a valid API request with sudo using curl and authentication via header:
```
curl --header "PRIVATE-TOKEN: QVy1PB7sTxfy4pqfZM1U" --header "SUDO: username" "http://example.com/api/v3/projects"
```
+
```
curl --header "PRIVATE-TOKEN: QVy1PB7sTxfy4pqfZM1U" --header "SUDO: 23" "http://example.com/api/v3/projects"
```
@@ -130,24 +125,21 @@ curl --header "PRIVATE-TOKEN: QVy1PB7sTxfy4pqfZM1U" --header "SUDO: 23" "http://
When listing resources you can pass the following parameters:
-+ `page` (default: `1`) - page number
-+ `per_page` (default: `20`, max: `100`) - number of items to list per page
+- `page` (default: `1`) - page number
+- `per_page` (default: `20`, max: `100`) - number of items to list per page
-[Link headers](http://www.w3.org/wiki/LinkHeader) are send back with each response.
-These have `rel` prev/next/first/last and contain the relevant url.
-Please use these instead of generating your own urls.
+[Link headers](http://www.w3.org/wiki/LinkHeader) are send back with each response. These have `rel` prev/next/first/last and contain the relevant URL. Please use these instead of generating your own urls.
## id vs iid
-When you work with API you may notice two similar fields in api entites: id and iid.
-The main difference between them is scope. Example:
+When you work with API you may notice two similar fields in api entites: id and iid. The main difference between them is scope. Example:
-Issue
- id: 46
- iid: 5
+Issue:
-* id - is uniq across all Issues table. It used for any api calls.
-* iid - is uniq only in scope of single project. When you browse issues or merge requests with Web UI - you see iid.
+ id: 46
+ iid: 5
-So if you want to get issue with api you use `http://host/api/v3/.../issues/:id.json`
-But when you want to create a link to web page - use `http:://host/project/issues/:iid.json`
+- id - is uniq across all Issues table. It used for any api calls.
+- iid - is uniq only in scope of single project. When you browse issues or merge requests with Web UI - you see iid.
+
+So if you want to get issue with api you use `http://host/api/v3/.../issues/:id.json`. But when you want to create a link to web page - use `http:://host/project/issues/:iid.json`
diff --git a/doc/api/branches.md b/doc/api/branches.md
index da9d4193f2..f695b48fe2 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -10,7 +10,7 @@ GET /projects/:id/repository/branches
Parameters:
-+ `id` (required) - The ID of a project
+- `id` (required) - The ID of a project
```json
[
@@ -52,8 +52,8 @@ GET /projects/:id/repository/branches/:branch
Parameters:
-+ `id` (required) - The ID of a project
-+ `branch` (required) - The name of the branch
+- `id` (required) - The ID of a project
+- `branch` (required) - The name of the branch
```json
{
@@ -82,7 +82,6 @@ Parameters:
}
```
-
## Protect repository branch
Protects a single project repository branch. This is an idempotent function, protecting an already
@@ -94,8 +93,8 @@ PUT /projects/:id/repository/branches/:branch/protect
Parameters:
-+ `id` (required) - The ID of a project
-+ `branch` (required) - The name of the branch
+- `id` (required) - The ID of a project
+- `branch` (required) - The name of the branch
```json
{
@@ -124,7 +123,6 @@ Parameters:
}
```
-
## Unprotect repository branch
Unprotects a single project repository branch. This is an idempotent function, unprotecting an already
@@ -136,8 +134,8 @@ PUT /projects/:id/repository/branches/:branch/unprotect
Parameters:
-+ `id` (required) - The ID of a project
-+ `branch` (required) - The name of the branch
+- `id` (required) - The ID of a project
+- `branch` (required) - The name of the branch
```json
{
@@ -168,16 +166,15 @@ Parameters:
## Create repository branch
-
```
POST /projects/:id/repository/branches
```
Parameters:
-+ `id` (required) - The ID of a project
-+ `branch_name` (required) - The name of the branch
-+ `ref` (required) - Create branch from commit sha or existing branch
+- `id` (required) - The ID of a project
+- `branch_name` (required) - The name of the branch
+- `ref` (required) - Create branch from commit sha or existing branch
```json
{
@@ -199,3 +196,17 @@ Parameters:
"protected": false
}
```
+
+## Delete repository branch
+
+
+```
+DELETE /projects/:id/repository/branches/:branch
+```
+
+Parameters:
+
++ `id` (required) - The ID of a project
++ `branch` (required) - The name of the branch
+
+It return 200 if succeed or 405 if failed with error message explaining reason.
diff --git a/doc/api/commits.md b/doc/api/commits.md
index 241fe0e585..d55b34c0c1 100644
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
@@ -10,8 +10,8 @@ GET /projects/:id/repository/commits
Parameters:
-+ `id` (required) - The ID of a project
-+ `ref_name` (optional) - The name of a repository branch or tag or if not given the default branch
+- `id` (required) - The ID of a project
+- `ref_name` (optional) - The name of a repository branch or tag or if not given the default branch
```json
[
@@ -44,8 +44,8 @@ GET /projects/:id/repository/commits/:sha
Parameters:
-+ `id` (required) - The ID of a project
-+ `sha` (required) - The commit hash or name of a repository branch or tag
+- `id` (required) - The ID of a project
+- `sha` (required) - The commit hash or name of a repository branch or tag
```json
{
@@ -63,7 +63,6 @@ Parameters:
}
```
-
## Get the diff of a commit
Get the diff of a commit in a project.
@@ -74,8 +73,8 @@ GET /projects/:id/repository/commits/:sha/diff
Parameters:
-+ `id` (required) - The ID of a project
-+ `sha` (required) - The name of a repository branch or tag or if not given the default branch
+- `id` (required) - The ID of a project
+- `sha` (required) - The name of a repository branch or tag or if not given the default branch
```json
[
@@ -91,5 +90,3 @@ Parameters:
}
]
```
-
-
diff --git a/doc/api/deploy_keys.md b/doc/api/deploy_keys.md
index d6c0e624df..e4492fc609 100644
--- a/doc/api/deploy_keys.md
+++ b/doc/api/deploy_keys.md
@@ -1,6 +1,6 @@
-## Deploy Keys
+# Deploy Keys
-### List deploy keys
+## List deploy keys
Get a list of a project's deploy keys.
@@ -10,7 +10,7 @@ GET /projects/:id/keys
Parameters:
-+ `id` (required) - The ID of the project
+- `id` (required) - The ID of the project
```json
[
@@ -29,8 +29,7 @@ Parameters:
]
```
-
-### Single deploy key
+## Single deploy key
Get a single key.
@@ -40,8 +39,8 @@ GET /projects/:id/keys/:key_id
Parameters:
-+ `id` (required) - The ID of the project
-+ `key_id` (required) - The ID of the deploy key
+- `id` (required) - The ID of the project
+- `key_id` (required) - The ID of the deploy key
```json
{
@@ -52,8 +51,7 @@ Parameters:
}
```
-
-### Add deploy key
+## Add deploy key
Creates a new deploy key for a project.
If deploy key already exists in another project - it will be joined to project but only if original one was is accessible by same user
@@ -64,12 +62,11 @@ POST /projects/:id/keys
Parameters:
-+ `id` (required) - The ID of the project
-+ `title` (required) - New deploy key's title
-+ `key` (required) - New deploy key
+- `id` (required) - The ID of the project
+- `title` (required) - New deploy key's title
+- `key` (required) - New deploy key
-
-### Delete deploy key
+## Delete deploy key
Delete a deploy key from a project
@@ -79,6 +76,5 @@ DELETE /projects/:id/keys/:key_id
Parameters:
-+ `id` (required) - The ID of the project
-+ `key_id` (required) - The ID of the deploy key
-
+- `id` (required) - The ID of the project
+- `key_id` (required) - The ID of the deploy key
diff --git a/doc/api/groups.md b/doc/api/groups.md
index f5f5d76905..1dbb93f908 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -1,3 +1,5 @@
+# Groups
+
## List project groups
Get a list of groups. (As user: my groups, as admin: all groups)
diff --git a/doc/api/issues.md b/doc/api/issues.md
index d18506f9ce..f775d502a6 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -1,3 +1,5 @@
+# Issues
+
## List issues
Get all issues created by authenticated user. This function takes pagination parameters
@@ -71,7 +73,6 @@ GET /issues
]
```
-
## List project issues
Get a list of project issues. This function accepts pagination parameters `page` and `per_page`
@@ -83,8 +84,7 @@ GET /projects/:id/issues
Parameters:
-+ `id` (required) - The ID of a project
-
+- `id` (required) - The ID of a project
## Single issue
@@ -96,8 +96,8 @@ GET /projects/:id/issues/:issue_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `issue_id` (required) - The ID of a project issue
+- `id` (required) - The ID of a project
+- `issue_id` (required) - The ID of a project issue
```json
{
@@ -140,7 +140,6 @@ Parameters:
}
```
-
## New issue
Creates a new project issue.
@@ -151,13 +150,12 @@ POST /projects/:id/issues
Parameters:
-+ `id` (required) - The ID of a project
-+ `title` (required) - The title of an issue
-+ `description` (optional) - The description of an issue
-+ `assignee_id` (optional) - The ID of a user to assign issue
-+ `milestone_id` (optional) - The ID of a milestone to assign issue
-+ `labels` (optional) - Comma-separated label names for an issue
-
+- `id` (required) - The ID of a project
+- `title` (required) - The title of an issue
+- `description` (optional) - The description of an issue
+- `assignee_id` (optional) - The ID of a user to assign issue
+- `milestone_id` (optional) - The ID of a milestone to assign issue
+- `labels` (optional) - Comma-separated label names for an issue
## Edit issue
@@ -169,21 +167,18 @@ PUT /projects/:id/issues/:issue_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `issue_id` (required) - The ID of a project's issue
-+ `title` (optional) - The title of an issue
-+ `description` (optional) - The description of an issue
-+ `assignee_id` (optional) - The ID of a user to assign issue
-+ `milestone_id` (optional) - The ID of a milestone to assign issue
-+ `labels` (optional) - Comma-separated label names for an issue
-+ `state_event` (optional) - The state event of an issue ('close' to close issue and 'reopen' to reopen it)
-
+- `id` (required) - The ID of a project
+- `issue_id` (required) - The ID of a project's issue
+- `title` (optional) - The title of an issue
+- `description` (optional) - The description of an issue
+- `assignee_id` (optional) - The ID of a user to assign issue
+- `milestone_id` (optional) - The ID of a milestone to assign issue
+- `labels` (optional) - Comma-separated label names for an issue
+- `state_event` (optional) - The state event of an issue ('close' to close issue and 'reopen' to reopen it)
## Delete existing issue (**Deprecated**)
-The function is deprecated and returns a `405 Method Not Allowed`
-error if called. An issue gets now closed and is done by calling `PUT /projects/:id/issues/:issue_id` with
-parameter `closed` set to 1.
+The function is deprecated and returns a `405 Method Not Allowed` error if called. An issue gets now closed and is done by calling `PUT /projects/:id/issues/:issue_id` with parameter `closed` set to 1.
```
DELETE /projects/:id/issues/:issue_id
@@ -191,8 +186,8 @@ DELETE /projects/:id/issues/:issue_id
Parameters:
-+ `id` (required) - The project ID
-+ `issue_id` (required) - The ID of the issue
+- `id` (required) - The project ID
+- `issue_id` (required) - The ID of the issue
## Comments on issues
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index d68f34971f..27c0d644e1 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -1,10 +1,8 @@
+# Merge requests
+
## List merge requests
-Get all merge requests for this project.
-The `state` parameter can be used to get only merge requests with a
-given state (`opened`, `closed`, or `merged`) or all of them (`all`).
-The pagination parameters `page` and `per_page` can be used to restrict the
-list of merge requests.
+Get all merge requests for this project. The `state` parameter can be used to get only merge requests with a given state (`opened`, `closed`, or `merged`) or all of them (`all`). The pagination parameters `page` and `per_page` can be used to restrict the list of merge requests.
```
GET /projects/:id/merge_requests
@@ -14,8 +12,8 @@ GET /projects/:id/merge_requests?state=all
Parameters:
-+ `id` (required) - The ID of a project
-+ `state` (optional) - Return `all` requests or just those that are `merged`, `opened` or `closed`
+- `id` (required) - The ID of a project
+- `state` (optional) - Return `all` requests or just those that are `merged`, `opened` or `closed`
```json
[
@@ -49,7 +47,6 @@ Parameters:
]
```
-
## Get single MR
Shows information about a single merge request.
@@ -60,8 +57,8 @@ GET /projects/:id/merge_request/:merge_request_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `merge_request_id` (required) - The ID of MR
+- `id` (required) - The ID of a project
+- `merge_request_id` (required) - The ID of MR
```json
{
@@ -93,7 +90,6 @@ Parameters:
}
```
-
## Create MR
Creates a new merge request.
@@ -104,12 +100,12 @@ POST /projects/:id/merge_requests
Parameters:
-+ `id` (required) - The ID of a project
-+ `source_branch` (required) - The source branch
-+ `target_branch` (required) - The target branch
-+ `assignee_id` (optional) - Assignee user ID
-+ `title` (required) - Title of MR
-+ `target_project_id` (optional) - The target project (numeric id)
+- `id` (required) - The ID of a project
+- `source_branch` (required) - The source branch
+- `target_branch` (required) - The target branch
+- `assignee_id` (optional) - Assignee user ID
+- `title` (required) - Title of MR
+- `target_project_id` (optional) - The target project (numeric id)
```json
{
@@ -140,7 +136,6 @@ Parameters:
}
```
-
## Update MR
Updates an existing merge request. You can change branches, title, or even close the MR.
@@ -151,13 +146,13 @@ PUT /projects/:id/merge_request/:merge_request_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `merge_request_id` (required) - ID of MR
-+ `source_branch` - The source branch
-+ `target_branch` - The target branch
-+ `assignee_id` - Assignee user ID
-+ `title` - Title of MR
-+ `state_event` - New state (close|reopen|merge)
+- `id` (required) - The ID of a project
+- `merge_request_id` (required) - ID of MR
+- `source_branch` - The source branch
+- `target_branch` - The target branch
+- `assignee_id` - Assignee user ID
+- `title` - Title of MR
+- `state_event` - New state (close|reopen|merge)
```json
{
@@ -188,13 +183,16 @@ Parameters:
}
```
-
## Accept MR
Merge changes submitted with MR usign this API.
+
If merge success you get 200 OK.
+
If it has some conflicts and can not be merged - you get 405 and error message 'Branch cannot be merged'
+
If merge request is already merged or closed - you get 405 and error message 'Method Not Allowed'
+
If you dont have permissions to accept this merge request - you get 401
```
@@ -203,9 +201,9 @@ PUT /projects/:id/merge_request/:merge_request_id/merge
Parameters:
-+ `id` (required) - The ID of a project
-+ `merge_request_id` (required) - ID of MR
-+ `merge_commit_message` (optional) - Custom merge commit message
+- `id` (required) - The ID of a project
+- `merge_request_id` (required) - ID of MR
+- `merge_commit_message` (optional) - Custom merge commit message
```json
{
@@ -236,7 +234,6 @@ Parameters:
}
```
-
## Post comment to MR
Adds a comment to a merge request.
@@ -247,10 +244,9 @@ POST /projects/:id/merge_request/:merge_request_id/comments
Parameters:
-+ `id` (required) - The ID of a project
-+ `merge_request_id` (required) - ID of merge request
-+ `note` (required) - Text of comment
-
+- `id` (required) - The ID of a project
+- `merge_request_id` (required) - ID of merge request
+- `note` (required) - Text of comment
```json
{
@@ -266,7 +262,6 @@ Parameters:
}
```
-
## Get the comments on a MR
Gets all the comments associated with a merge request.
@@ -277,8 +272,8 @@ GET /projects/:id/merge_request/:merge_request_id/comments
Parameters:
-+ `id` (required) - The ID of a project
-+ `merge_request_id` (required) - ID of merge request
+- `id` (required) - The ID of a project
+- `merge_request_id` (required) - ID of merge request
```json
[
diff --git a/doc/api/milestones.md b/doc/api/milestones.md
index 2a2ef4b79b..2f52532750 100644
--- a/doc/api/milestones.md
+++ b/doc/api/milestones.md
@@ -1,3 +1,5 @@
+# Milestones
+
## List project milestones
Returns a list of project milestones.
@@ -24,8 +26,7 @@ GET /projects/:id/milestones
Parameters:
-+ `id` (required) - The ID of a project
-
+- `id` (required) - The ID of a project
## Get single milestone
@@ -37,9 +38,8 @@ GET /projects/:id/milestones/:milestone_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `milestone_id` (required) - The ID of a project milestone
-
+- `id` (required) - The ID of a project
+- `milestone_id` (required) - The ID of a project milestone
## Create new milestone
@@ -51,11 +51,10 @@ POST /projects/:id/milestones
Parameters:
-+ `id` (required) - The ID of a project
-+ `title` (required) - The title of an milestone
-+ `description` (optional) - The description of the milestone
-+ `due_date` (optional) - The due date of the milestone
-
+- `id` (required) - The ID of a project
+- `title` (required) - The title of an milestone
+- `description` (optional) - The description of the milestone
+- `due_date` (optional) - The due date of the milestone
## Edit milestone
@@ -67,10 +66,9 @@ PUT /projects/:id/milestones/:milestone_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `milestone_id` (required) - The ID of a project milestone
-+ `title` (optional) - The title of a milestone
-+ `description` (optional) - The description of a milestone
-+ `due_date` (optional) - The due date of the milestone
-+ `state_event` (optional) - The state event of the milestone (close|activate)
-
+- `id` (required) - The ID of a project
+- `milestone_id` (required) - The ID of a project milestone
+- `title` (optional) - The title of a milestone
+- `description` (optional) - The description of a milestone
+- `due_date` (optional) - The due date of the milestone
+- `state_event` (optional) - The state event of the milestone (close|activate)
diff --git a/doc/api/notes.md b/doc/api/notes.md
index e9ad6e00c7..e7f19965a3 100644
--- a/doc/api/notes.md
+++ b/doc/api/notes.md
@@ -1,65 +1,6 @@
-Notes can be wall notes or comments on snippets, issues or merge requests.
-
-## Wall
-
-### List project wall notes
-
-Get a list of project wall notes.
-
-```
-GET /projects/:id/notes
-```
-
-Parameters:
-
-+ `id` (required) - The ID of a project
-
-```json
-[
- {
- "id": 522,
- "body": "The solution is rather tricky",
- "attachment": null,
- "author": {
- "id": 1,
- "username": "john_smith",
- "email": "john@example.com",
- "name": "John Smith",
- "state": "active",
- "created_at": "2012-05-23T08:00:58Z"
- },
- "created_at": "2012-11-27T19:16:44Z"
- }
-]
-```
-
-### Get single wall note
-
-Returns a single wall note.
-
-```
-GET /projects/:id/notes/:note_id
-```
-
-Parameters:
-
-+ `id` (required) - The ID of a project
-+ `note_id` (required) - The ID of a wall note
-
-
-### Create new wall note
-
-Creates a new wall note.
-
-```
-POST /projects/:id/notes
-```
-
-Parameters:
-
-+ `id` (required) - The ID of a project
-+ `body` (required) - The content of a note
+# Notes
+Notes are comments on snippets, issues or merge requests.
## Issues
diff --git a/doc/api/project_snippets.md b/doc/api/project_snippets.md
index e16e1e8459..47c81b6446 100644
--- a/doc/api/project_snippets.md
+++ b/doc/api/project_snippets.md
@@ -1,3 +1,5 @@
+# Project snippets
+
## List snippets
Get a list of project snippets.
@@ -8,8 +10,7 @@ GET /projects/:id/snippets
Parameters:
-+ `id` (required) - The ID of a project
-
+- `id` (required) - The ID of a project
## Single snippet
@@ -21,8 +22,8 @@ GET /projects/:id/snippets/:snippet_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `snippet_id` (required) - The ID of a project's snippet
+- `id` (required) - The ID of a project
+- `snippet_id` (required) - The ID of a project's snippet
```json
{
@@ -43,7 +44,6 @@ Parameters:
}
```
-
## Create new snippet
Creates a new project snippet. The user must have permission to create new snippets.
@@ -54,11 +54,10 @@ POST /projects/:id/snippets
Parameters:
-+ `id` (required) - The ID of a project
-+ `title` (required) - The title of a snippet
-+ `file_name` (required) - The name of a snippet file
-+ `code` (required) - The content of a snippet
-
+- `id` (required) - The ID of a project
+- `title` (required) - The title of a snippet
+- `file_name` (required) - The name of a snippet file
+- `code` (required) - The content of a snippet
## Update snippet
@@ -70,12 +69,11 @@ PUT /projects/:id/snippets/:snippet_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `snippet_id` (required) - The ID of a project's snippet
-+ `title` (optional) - The title of a snippet
-+ `file_name` (optional) - The name of a snippet file
-+ `code` (optional) - The content of a snippet
-
+- `id` (required) - The ID of a project
+- `snippet_id` (required) - The ID of a project's snippet
+- `title` (optional) - The title of a snippet
+- `file_name` (optional) - The name of a snippet file
+- `code` (optional) - The content of a snippet
## Delete snippet
@@ -88,9 +86,8 @@ DELETE /projects/:id/snippets/:snippet_id
Parameters:
-+ `id` (required) - The ID of a project
-+ `snippet_id` (required) - The ID of a project's snippet
-
+- `id` (required) - The ID of a project
+- `snippet_id` (required) - The ID of a project's snippet
## Snippet content
@@ -102,5 +99,5 @@ GET /projects/:id/snippets/:snippet_id/raw
Parameters:
-+ `id` (required) - The ID of a project
-+ `snippet_id` (required) - The ID of a project's snippet
+- `id` (required) - The ID of a project
+- `snippet_id` (required) - The ID of a project's snippet
diff --git a/doc/api/projects.md b/doc/api/projects.md
index ffaba0af7f..d32af678fc 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -1,4 +1,4 @@
-## Projects
+# Projects
### List projects
@@ -30,7 +30,6 @@ GET /projects
"path_with_namespace": "diaspora/diaspora-client",
"issues_enabled": true,
"merge_requests_enabled": true,
- "wall_enabled": false,
"wiki_enabled": true,
"snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z",
@@ -66,7 +65,6 @@ GET /projects
"path_with_namespace": "brightbox/puppet",
"issues_enabled": true,
"merge_requests_enabled": true,
- "wall_enabled": false,
"wiki_enabled": true,
"snippets_enabled": false,
"created_at": "2013-09-30T13:46:02Z",
@@ -136,7 +134,6 @@ Parameters:
"path_with_namespace": "diaspora/diaspora-project-site",
"issues_enabled": true,
"merge_requests_enabled": true,
- "wall_enabled": false,
"wiki_enabled": true,
"snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z",
@@ -252,7 +249,6 @@ Parameters:
+ `namespace_id` (optional) - namespace for the new project (defaults to user)
+ `description` (optional) - short project description
+ `issues_enabled` (optional)
-+ `wall_enabled` (optional)
+ `merge_requests_enabled` (optional)
+ `wiki_enabled` (optional)
+ `snippets_enabled` (optional)
@@ -276,7 +272,6 @@ Parameters:
+ `description` (optional) - short project description
+ `default_branch` (optional) - 'master' by default
+ `issues_enabled` (optional)
-+ `wall_enabled` (optional)
+ `merge_requests_enabled` (optional)
+ `wiki_enabled` (optional)
+ `snippets_enabled` (optional)
diff --git a/doc/api/repositories.md b/doc/api/repositories.md
index 858fad0a0b..26ae3e8723 100644
--- a/doc/api/repositories.md
+++ b/doc/api/repositories.md
@@ -1,3 +1,5 @@
+# Repositories
+
## List project repository tags
Get a list of repository tags from a project, sorted by name in reverse alphabetical order.
@@ -35,6 +37,40 @@ Parameters:
]
```
+## Create a new tag
+
+Creates new tag in the repository that points to the supplied ref.
+
+```
+POST /projects/:id/repository/tags
+```
+
+Parameters:
+
++ `id` (required) - The ID of a project
++ `tag_name` (required) - The name of a tag
++ `ref` (required) - Create tag using commit sha, another tag name, or branch name.
+
+```json
+[
+ {
+ "name": "v1.0.0",
+ "commit": {
+ "id": "2695effb5807a22ff3d138d593fd856244e155e7",
+ "parents": [],
+ "message": "Initial commit",
+ "authored_date": "2012-05-28T04:42:42-07:00",
+ "author_name": "John Smith",
+ "author email": "john@example.com",
+ "committer_name": "Jack Smith",
+ "committed_date": "2012-05-28T04:42:42-07:00",
+ "committer_email": "jack@example.com"
+ },
+ "protected": false
+ }
+]
+```
+
## List repository tree
Get a list of repository files and directories in a project.
@@ -131,3 +167,56 @@ GET /projects/:id/repository/archive
Parameters:
+ `id` (required) - The ID of a project
+ `sha` (optional) - The commit sha to download defaults to the tip of the default branch
+
+
+## Compare branches, tags or commits
+
+```
+GET /projects/:id/repository/compare
+```
+
+Parameters:
++ `id` (required) - The ID of a project
++ `from` (required) - the commit sha or branch name
++ `to` (required) - the commit sha or branch name
+
+
+```
+GET /projects/:id/repository/compare?from=master&to=feature
+```
+
+Response:
+
+```json
+
+{
+ "commit": {
+ "id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
+ "short_id": "12d65c8dd2b",
+ "title": "JS fix",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "created_at": "2014-02-27T10:27:00+02:00"
+ },
+ "commits": [{
+ "id": "12d65c8dd2b2676fa3ac47d955accc085a37a9c1",
+ "short_id": "12d65c8dd2b",
+ "title": "JS fix",
+ "author_name": "Dmitriy Zaporozhets",
+ "author_email": "dmitriy.zaporozhets@gmail.com",
+ "created_at": "2014-02-27T10:27:00+02:00"
+ }],
+ "diffs": [{
+ "old_path": "files/js/application.js",
+ "new_path": "files/js/application.js",
+ "a_mode": null,
+ "b_mode": "100644",
+ "diff": "--- a/files/js/application.js\n+++ b/files/js/application.js\n@@ -24,8 +24,10 @@\n //= require g.raphael-min\n //= require g.bar-min\n //= require branch-graph\n-//= require highlightjs.min\n-//= require ace/ace\n //= require_tree .\n //= require d3\n //= require underscore\n+\n+function fix() { \n+ alert(\"Fixed\")\n+}",
+ "new_file": false,
+ "renamed_file": false,
+ "deleted_file": false
+ }],
+ "compare_timeout": false,
+ "compare_same_ref": false
+}
+```
diff --git a/doc/api/repository_files.md b/doc/api/repository_files.md
index b215cc2500..ae56b04b6c 100644
--- a/doc/api/repository_files.md
+++ b/doc/api/repository_files.md
@@ -1,13 +1,14 @@
-# CRUD for repository files
+# Repository files
+
+## CRUD for repository files
## Create, read, update and delete repository files using this API
-- - -
+---
## Get file from repository
-Allows you to receive information about file in repository like name, size, content.
-Note that file content is Base64 encoded.
+Allows you to receive information about file in repository like name, size, content. Note that file content is Base64 encoded.
```
GET /projects/:id/repository/files
@@ -30,8 +31,8 @@ Example response:
Parameters:
-+ `file_path` (required) - Full path to new file. Ex. lib/class.rb
-+ `ref` (required) - The name of branch, tag or commit
+- `file_path` (required) - Full path to new file. Ex. lib/class.rb
+- `ref` (required) - The name of branch, tag or commit
## Create new file in repository
@@ -50,11 +51,11 @@ Example response:
Parameters:
-+ `file_path` (required) - Full path to new file. Ex. lib/class.rb
-+ `branch_name` (required) - The name of branch
-+ `encoding` (optional) - 'text' or 'base64'. Text is default.
-+ `content` (required) - File content
-+ `commit_message` (required) - Commit message
+- `file_path` (required) - Full path to new file. Ex. lib/class.rb
+- `branch_name` (required) - The name of branch
+- `encoding` (optional) - 'text' or 'base64'. Text is default.
+- `content` (required) - File content
+- `commit_message` (required) - Commit message
## Update existing file in repository
@@ -73,11 +74,11 @@ Example response:
Parameters:
-+ `file_path` (required) - Full path to file. Ex. lib/class.rb
-+ `branch_name` (required) - The name of branch
-+ `encoding` (optional) - 'text' or 'base64'. Text is default.
-+ `content` (required) - New file content
-+ `commit_message` (required) - Commit message
+- `file_path` (required) - Full path to file. Ex. lib/class.rb
+- `branch_name` (required) - The name of branch
+- `encoding` (optional) - 'text' or 'base64'. Text is default.
+- `content` (required) - New file content
+- `commit_message` (required) - Commit message
## Delete existing file in repository
@@ -96,7 +97,6 @@ Example response:
Parameters:
-+ `file_path` (required) - Full path to file. Ex. lib/class.rb
-+ `branch_name` (required) - The name of branch
-+ `commit_message` (required) - Commit message
-
+- `file_path` (required) - Full path to file. Ex. lib/class.rb
+- `branch_name` (required) - The name of branch
+- `commit_message` (required) - Commit message
diff --git a/doc/api/session.md b/doc/api/session.md
index 0be5af79da..2e717a2ea7 100644
--- a/doc/api/session.md
+++ b/doc/api/session.md
@@ -1,3 +1,5 @@
+# Session
+
Login to get private token
```
diff --git a/doc/api/system_hooks.md b/doc/api/system_hooks.md
index d4c45ea9bb..6483a73c7e 100644
--- a/doc/api/system_hooks.md
+++ b/doc/api/system_hooks.md
@@ -1,6 +1,8 @@
+# System hooks
+
All methods require admin authorization.
-The url endpoint of the system hooks can be configured in [the admin area under hooks](/admin/hooks).
+The URL endpoint of the system hooks can be configured in [the admin area under hooks](/admin/hooks).
## List system hooks
@@ -12,7 +14,7 @@ GET /hooks
Parameters:
-+ **none**
+- **none**
```json
[
@@ -32,8 +34,7 @@ POST /hooks
Parameters:
-+ `url` (required) - The hook URL
-
+- `url` (required) - The hook URL
## Test system hook
@@ -43,7 +44,7 @@ GET /hooks/:id
Parameters:
-+ `id` (required) - The ID of hook
+- `id` (required) - The ID of hook
```json
{
@@ -58,8 +59,7 @@ Parameters:
## Delete system hook
-Deletes a system hook. This is an idempotent API function and returns `200 Ok` even if the hook
-is not available. If the hook is deleted it is also returned as JSON.
+Deletes a system hook. This is an idempotent API function and returns `200 Ok` even if the hook is not available. If the hook is deleted it is also returned as JSON.
```
DELETE /hooks/:id
@@ -67,4 +67,4 @@ DELETE /hooks/:id
Parameters:
-+ `id` (required) - The ID of hook
+- `id` (required) - The ID of hook
diff --git a/doc/api/users.md b/doc/api/users.md
index 2b927c3077..4ddbf73977 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -1,8 +1,39 @@
+# Users
+
## List users
Get a list of users.
+
This function takes pagination parameters `page` and `per_page` to restrict the list of users.
+### For normal users:
+
+```
+GET /users
+```
+
+```json
+[
+ {
+ "id": 1,
+ "username": "john_smith",
+ "name": "John Smith",
+ "state": "active",
+ "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
+ },
+ {
+ "id": 2,
+ "username": "jack_smith",
+ "name": "Jack Smith",
+ "state": "blocked",
+ "avatar_url": "http://gravatar.com/../e32131cd8.jpeg",
+ }
+]
+```
+
+
+### For admins:
+
```
GET /users
```
@@ -26,6 +57,7 @@ GET /users
"theme_id": 1,
"color_scheme_id": 2,
"is_admin": false,
+ "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
"can_create_group": true
},
{
@@ -45,14 +77,14 @@ GET /users
"theme_id": 1,
"color_scheme_id": 3,
"is_admin": false,
+ "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
"can_create_group": true,
"can_create_project": true
}
]
```
-You can search for a users by email or username with:
-`/users?search=John`
+You can search for a users by email or username with: `/users?search=John`
Also see `def search query` in `app/models/user.rb`.
@@ -60,13 +92,36 @@ Also see `def search query` in `app/models/user.rb`.
Get a single user.
+#### For user:
+
```
GET /users/:id
```
Parameters:
-+ `id` (required) - The ID of a user
+- `id` (required) - The ID of a user
+
+```json
+{
+ "id": 1,
+ "username": "john_smith",
+ "name": "John Smith",
+ "state": "active",
+ "avatar_url": "http://localhost:3000/uploads/user/avatar/1/cd8.jpeg",
+}
+```
+
+
+#### For admin:
+
+```
+GET /users/:id
+```
+
+Parameters:
+
+- `id` (required) - The ID of a user
```json
{
@@ -91,7 +146,6 @@ Parameters:
}
```
-
## User creation
Creates a new user. Note only administrators can create new users.
@@ -102,21 +156,20 @@ POST /users
Parameters:
-+ `email` (required) - Email
-+ `password` (required) - Password
-+ `username` (required) - Username
-+ `name` (required) - Name
-+ `skype` (optional) - Skype ID
-+ `linkedin` (optional) - Linkedin
-+ `twitter` (optional) - Twitter account
-+ `website_url` (optional) - Website url
-+ `projects_limit` (optional) - Number of projects user can create
-+ `extern_uid` (optional) - External UID
-+ `provider` (optional) - External provider name
-+ `bio` (optional) - User's bio
-+ `admin` (optional) - User is admin - true or false (default)
-+ `can_create_group` (optional) - User can create groups - true or false
-
+- `email` (required) - Email
+- `password` (required) - Password
+- `username` (required) - Username
+- `name` (required) - Name
+- `skype` (optional) - Skype ID
+- `linkedin` (optional) - Linkedin
+- `twitter` (optional) - Twitter account
+- `website_url` (optional) - Website url
+- `projects_limit` (optional) - Number of projects user can create
+- `extern_uid` (optional) - External UID
+- `provider` (optional) - External provider name
+- `bio` (optional) - User's bio
+- `admin` (optional) - User is admin - true or false (default)
+- `can_create_group` (optional) - User can create groups - true or false
## User modification
@@ -128,30 +181,26 @@ PUT /users/:id
Parameters:
-+ `email` - Email
-+ `username` - Username
-+ `name` - Name
-+ `password` - Password
-+ `skype` - Skype ID
-+ `linkedin` - Linkedin
-+ `twitter` - Twitter account
-+ `website_url` - Website url
-+ `projects_limit` - Limit projects each user can create
-+ `extern_uid` - External UID
-+ `provider` - External provider name
-+ `bio` - User's bio
-+ `admin` (optional) - User is admin - true or false (default)
-+ `can_create_group` (optional) - User can create groups - true or false
-
-Note, at the moment this method does only return a 404 error, even in cases where a 409 (Conflict) would
-be more appropriate, e.g. when renaming the email address to some existing one.
+- `email` - Email
+- `username` - Username
+- `name` - Name
+- `password` - Password
+- `skype` - Skype ID
+- `linkedin` - Linkedin
+- `twitter` - Twitter account
+- `website_url` - Website url
+- `projects_limit` - Limit projects each user can create
+- `extern_uid` - External UID
+- `provider` - External provider name
+- `bio` - User's bio
+- `admin` (optional) - User is admin - true or false (default)
+- `can_create_group` (optional) - User can create groups - true or false
+Note, at the moment this method does only return a 404 error, even in cases where a 409 (Conflict) would be more appropriate, e.g. when renaming the email address to some existing one.
## User deletion
-Deletes a user. Available only for administrators. This is an idempotent function, calling this function
-for a non-existent user id still returns a status code `200 Ok`. The JSON response differs if the user
-was actually deleted or not. In the former the user is returned and in the latter not.
+Deletes a user. Available only for administrators. This is an idempotent function, calling this function for a non-existent user id still returns a status code `200 Ok`. The JSON response differs if the user was actually deleted or not. In the former the user is returned and in the latter not.
```
DELETE /users/:id
@@ -159,8 +208,7 @@ DELETE /users/:id
Parameters:
-+ `id` (required) - The ID of the user
-
+- `id` (required) - The ID of the user
## Current user
@@ -192,7 +240,6 @@ GET /user
}
```
-
## List SSH keys
Get a list of currently authenticated user's SSH keys.
@@ -218,7 +265,7 @@ GET /user/keys
Parameters:
-+ **none**
+- **none**
## List SSH keys for user
@@ -230,8 +277,7 @@ GET /users/:uid/keys
Parameters:
-+ `uid` (required) - id of specified user
-
+- `uid` (required) - id of specified user
## Single SSH key
@@ -243,7 +289,7 @@ GET /user/keys/:id
Parameters:
-+ `id` (required) - The ID of an SSH key
+- `id` (required) - The ID of an SSH key
```json
{
@@ -253,7 +299,6 @@ Parameters:
}
```
-
## Add SSH key
Creates a new key owned by the currently authenticated user.
@@ -264,9 +309,8 @@ POST /user/keys
Parameters:
-+ `title` (required) - new SSH Key's title
-+ `key` (required) - new SSH key
-
+- `title` (required) - new SSH Key's title
+- `key` (required) - new SSH key
## Add SSH key for user
@@ -278,17 +322,15 @@ POST /users/:id/keys
Parameters:
-+ `id` (required) - id of specified user
-+ `title` (required) - new SSH Key's title
-+ `key` (required) - new SSH key
+- `id` (required) - id of specified user
+- `title` (required) - new SSH Key's title
+- `key` (required) - new SSH key
-Will return created key with status `201 Created` on success, or `404 Not
-found` on fail.
+Will return created key with status `201 Created` on success, or `404 Not found` on fail.
-## Delete SSH key
+## Delete SSH key for current user
-Deletes key owned by currently authenticated user. This is an idempotent function and calling it on a key that is already
-deleted or not available results in `200 Ok`.
+Deletes key owned by currently authenticated user. This is an idempotent function and calling it on a key that is already deleted or not available results in `200 Ok`.
```
DELETE /user/keys/:id
@@ -296,9 +338,9 @@ DELETE /user/keys/:id
Parameters:
-+ `id` (required) - SSH key ID
+- `id` (required) - SSH key ID
-## Delete SSH key
+## Delete SSH key for given user
Deletes key owned by a specified user. Available only for admin.
@@ -308,8 +350,7 @@ DELETE /users/:uid/keys/:id
Parameters:
-+ `uid` (required) - id of specified user
-+ `id` (required) - SSH key ID
+- `uid` (required) - id of specified user
+- `id` (required) - SSH key ID
Will return `200 Ok` on success, or `404 Not found` if either user or key cannot be found.
-
diff --git a/doc/development/README.md b/doc/development/README.md
index eb88b6c860..67ee828db6 100644
--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -1,5 +1,5 @@
-## Development
+# Development
-+ [Architecture](architecture.md) of GitLab
-+ [Shell commands](shell_commands.md) in the GitLab codebase
-+ [Rake tasks](rake_tasks.md) for development
+- [Architecture](architecture.md) of GitLab
+- [Shell commands](shell_commands.md) in the GitLab codebase
+- [Rake tasks](rake_tasks.md) for development
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index f2f7a3d5f0..9d0d58b3db 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -1,78 +1,54 @@
# GitLab Architecture Overview
----
-# Software delivery
+## Software delivery
-There are two editions of GitLab: [Enterprise Edition](https://www.gitlab.com/gitlab-ee/) (EE) and [Community Edition](https://www.gitlab.com/gitlab-ce/) (CE).
-GitLab CE is delivered via git from the [gitlabhq repository](https://gitlab.com/gitlab-org/gitlab-ce/tree/master).
-New versions of GitLab are released in stable branches and the master branch is for bleeding edge development.
+There are two editions of GitLab: [Enterprise Edition](https://www.gitlab.com/gitlab-ee/) (EE) and [Community Edition](https://www.gitlab.com/gitlab-ce/) (CE). GitLab CE is delivered via git from the [gitlabhq repository](https://gitlab.com/gitlab-org/gitlab-ce/tree/master). New versions of GitLab are released in stable branches and the master branch is for bleeding edge development.
-EE releases are available not long after CE releases.
-To obtain the GitLab EE there is a [repository at gitlab.com](https://gitlab.com/subscribers/gitlab-ee).
-For more information about the release process see the section 'New versions and upgrading' in the readme.
+EE releases are available not long after CE releases. To obtain the GitLab EE there is a [repository at gitlab.com](https://gitlab.com/subscribers/gitlab-ee). For more information about the release process see the section 'New versions and upgrading' in the readme.
-Both EE and CE require an add-on component called gitlab-shell.
-It is obtained from the [gitlab-shell repository](https://gitlab.com/gitlab-org/gitlab-shell/tree/master).
-New versions are usually tags but staying on the master branch will give you the latest stable version.
-New releases are generally around the same time as GitLab CE releases with exception for informal security updates deemed critical.
+Both EE and CE require an add-on component called gitlab-shell. It is obtained from the [gitlab-shell repository](https://gitlab.com/gitlab-org/gitlab-shell/tree/master). New versions are usually tags but staying on the master branch will give you the latest stable version. New releases are generally around the same time as GitLab CE releases with exception for informal security updates deemed critical.
-# System Layout
+## System Layout
When referring to ~git in the pictures it means the home directory of the git user which is typically /home/git.
-GitLab is primarily installed within the `/home/git` user home directory as `git` user.
-Within the home directory is where the gitlabhq server software resides as well as the repositories (though the repository location is configurable).
-The bare repositories are located in `/home/git/repositories`.
-GitLab is a ruby on rails application so the particulars of the inner workings can be learned by studying how a ruby on rails application works.
+GitLab is primarily installed within the `/home/git` user home directory as `git` user. Within the home directory is where the gitlabhq server software resides as well as the repositories (though the repository location is configurable).
+
+The bare repositories are located in `/home/git/repositories`. GitLab is a ruby on rails application so the particulars of the inner workings can be learned by studying how a ruby on rails application works.
+
To serve repositories over SSH there's an add-on application called gitlab-shell which is installed in `/home/git/gitlab-shell`.
-## Components
+### Components
-A typical install of GitLab will be on Ubuntu Linux or RHEL/CentOS.
-It uses Nginx or Apache as a web front end to proxypass the Unicorn web server.
-By default, communication between Unicorn and the front end is via a Unix domain socket but forwarding requests via TCP is also supported.
-The web front end accesses `/home/git/gitlab/public` bypassing the Unicorn server to serve static pages, uploads (e.g. avatar images or attachments), and precompiled assets.
-GitLab serves web pages and a [GitLab API](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/api) using the Unicorn web server.
-It uses Sidekiq as a job queue which, in turn, uses redis as a non-persistent database backend for job information, meta data, and incomming jobs.
-The GitLab web app uses MySQL or PostgreSQL for persistent database information (e.g. users, permissions, issues, other meta data).
-GitLab stores the bare git repositories it serves in `/home/git/repositories` by default.
-It also keeps default branch and hook information with the bare repository.
-`/home/git/gitlab-satellites` keeps checked out repositories when performing actions such as a merge request, editing files in the web interface, etc.
-The satellite repository is used by the web interface for editing repositories and the wiki which is also a git repository.
-When serving repositories over HTTP/HTTPS GitLab utilizes the GitLab API to resolve authorization and access as well as serving git objects.
+A typical install of GitLab will be on Ubuntu Linux or RHEL/CentOS. It uses Nginx or Apache as a web front end to proxypass the Unicorn web server. By default, communication between Unicorn and the front end is via a Unix domain socket but forwarding requests via TCP is also supported. The web front end accesses `/home/git/gitlab/public` bypassing the Unicorn server to serve static pages, uploads (e.g. avatar images or attachments), and precompiled assets. GitLab serves web pages and a [GitLab API](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/api) using the Unicorn web server. It uses Sidekiq as a job queue which, in turn, uses redis as a non-persistent database backend for job information, meta data, and incomming jobs.
-The add-on component gitlab-shell serves repositories over SSH.
-It manages the SSH keys within `/home/git/.ssh/authorized_keys` which should not be manually edited.
-gitlab-shell accesses the bare repositories directly to serve git objects and communicates with redis to submit jobs to Sidekiq for GitLab to process.
- gitlab-shell queries the GitLab API to determine authorization and access.
+The GitLab web app uses MySQL or PostgreSQL for persistent database information (e.g. users, permissions, issues, other meta data). GitLab stores the bare git repositories it serves in `/home/git/repositories` by default. It also keeps default branch and hook information with the bare repository. `/home/git/gitlab-satellites` keeps checked out repositories when performing actions such as a merge request, editing files in the web interface, etc.
-## Installation Folder Summary
+The satellite repository is used by the web interface for editing repositories and the wiki which is also a git repository. When serving repositories over HTTP/HTTPS GitLab utilizes the GitLab API to resolve authorization and access as well as serving git objects.
+
+The add-on component gitlab-shell serves repositories over SSH. It manages the SSH keys within `/home/git/.ssh/authorized_keys` which should not be manually edited. gitlab-shell accesses the bare repositories directly to serve git objects and communicates with redis to submit jobs to Sidekiq for GitLab to process. gitlab-shell queries the GitLab API to determine authorization and access.
+
+### Installation Folder Summary
To summarize here's the [directory structure of the `git` user home directory](../install/structure.md).
-
-## Processes
+### Processes
ps aux | grep '^git'
-GitLab has several components to operate.
-As a system user (i.e. any user that is not the `git` user) it requires a persistent database (MySQL/PostreSQL) and redis database.
-It also uses Apache httpd or nginx to proxypass Unicorn.
-As the `git` user it starts Sidekiq and Unicorn (a simple ruby HTTP server running on port `8080` by default).
-Under the gitlab user there are normally 4 processes: `unicorn_rails master` (1 process), `unicorn_rails worker` (2 processes), `sidekiq` (1 process).
+GitLab has several components to operate. As a system user (i.e. any user that is not the `git` user) it requires a persistent database (MySQL/PostreSQL) and redis database. It also uses Apache httpd or nginx to proxypass Unicorn. As the `git` user it starts Sidekiq and Unicorn (a simple ruby HTTP server running on port `8080` by default). Under the gitlab user there are normally 4 processes: `unicorn_rails master` (1 process), `unicorn_rails worker` (2 processes), `sidekiq` (1 process).
-## Repository access
+### Repository access
-Repositories get accessed via HTTP or SSH.
-HTTP cloning/push/pull utilizes the GitLab API and SSH cloning is handled by gitlab-shell (previously explained).
+Repositories get accessed via HTTP or SSH. HTTP cloning/push/pull utilizes the GitLab API and SSH cloning is handled by gitlab-shell (previously explained).
-# Troubleshooting
+## Troubleshooting
See the README for more information.
-## Init scripts of the services
+### Init scripts of the services
The GitLab init script starts and stops Unicorn and Sidekiq.
@@ -115,61 +91,59 @@ $ /etc/init.d/postgresql
Usage: /etc/init.d/postgresql {start|stop|restart|reload|force-reload|status} [version ..]
```
-## Log locations of the services
+### Log locations of the services
Note: `/home/git/` is shorthand for `/home/git`.
gitlabhq (includes Unicorn and Sidekiq logs)
-* `/home/git/gitlab/log/` contains `application.log`, `production.log`, `sidekiq.log`, `unicorn.stdout.log`, `githost.log`, `satellites.log`, and `unicorn.stderr.log` normally.
+- `/home/git/gitlab/log/` contains `application.log`, `production.log`, `sidekiq.log`, `unicorn.stdout.log`, `githost.log`, `satellites.log`, and `unicorn.stderr.log` normally.
gitlab-shell
-* `/home/git/gitlab-shell/gitlab-shell.log`
+- `/home/git/gitlab-shell/gitlab-shell.log`
ssh
-* `/var/log/auth.log` auth log (on Ubuntu).
-* `/var/log/secure` auth log (on RHEL).
+- `/var/log/auth.log` auth log (on Ubuntu).
+- `/var/log/secure` auth log (on RHEL).
nginx
-* `/var/log/nginx/` contains error and access logs.
+- `/var/log/nginx/` contains error and access logs.
Apache httpd
-* [Explanation of apache logs](http://httpd.apache.org/docs/2.2/logs.html).
-* `/var/log/apache2/` contains error and output logs (on Ubuntu).
-* `/var/log/httpd/` contains error and output logs (on RHEL).
+- [Explanation of apache logs](http://httpd.apache.org/docs/2.2/logs.html).
+- `/var/log/apache2/` contains error and output logs (on Ubuntu).
+- `/var/log/httpd/` contains error and output logs (on RHEL).
redis
-* `/var/log/redis/redis.log` there are also logrotated logs there.
+- `/var/log/redis/redis.log` there are also logrotated logs there.
PostgreSQL
-* `/var/log/postgresql/*`
+- `/var/log/postgresql/*`
MySQL
-* `/var/log/mysql/*`
-* `/var/log/mysql.*`
+- `/var/log/mysql/*`
+- `/var/log/mysql.*`
-## GitLab specific config files
+### GitLab specific config files
-GitLab has configuration files located in `/home/git/gitlab/config/*`.
-Commonly referenced config files include:
+GitLab has configuration files located in `/home/git/gitlab/config/*`. Commonly referenced config files include:
-* `gitlab.yml` - GitLab configuration.
-* `unicorn.rb` - Unicorn web server settings.
-* `database.yml` - Database connection settings.
+- `gitlab.yml` - GitLab configuration.
+- `unicorn.rb` - Unicorn web server settings.
+- `database.yml` - Database connection settings.
gitlab-shell has a configuration file at `/home/git/gitlab-shell/config.yml`.
-## Maintenance Tasks
+### Maintenance Tasks
-[GitLab](https://gitlab.com/gitlab-org/gitlab-ce/tree/master) provides rake tasks with which you see version information and run a quick check on your configuration to ensure it is configured properly within the application.
-See [maintenance rake tasks](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/raketasks/maintenance.md).
+[GitLab](https://gitlab.com/gitlab-org/gitlab-ce/tree/master) provides rake tasks with which you see version information and run a quick check on your configuration to ensure it is configured properly within the application. See [maintenance rake tasks](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/raketasks/maintenance.md).
In a nutshell, do the following:
```
@@ -179,5 +153,4 @@ bundle exec rake gitlab:env:info RAILS_ENV=production
bundle exec rake gitlab:check RAILS_ENV=production
```
-Note: It is recommended to log into the `git` user using `sudo -i -u git` or `sudo su - git`.
-While the sudo commands provided by gitlabhq work in Ubuntu they do not always work in RHEL.
\ No newline at end of file
+Note: It is recommended to log into the `git` user using `sudo -i -u git` or `sudo su - git`. While the sudo commands provided by gitlabhq work in Ubuntu they do not always work in RHEL.
diff --git a/doc/development/shell_commands.md b/doc/development/shell_commands.md
index af0d5ca442..1f3908f4e2 100644
--- a/doc/development/shell_commands.md
+++ b/doc/development/shell_commands.md
@@ -8,9 +8,7 @@
## Use File and FileUtils instead of shell commands
-Sometimes we invoke basic Unix commands via the shell when there is also a Ruby API for doing it.
-Use the Ruby API if it exists.
-http://www.ruby-doc.org/stdlib-2.0.0/libdoc/fileutils/rdoc/FileUtils.html#module-FileUtils-label-Module+Functions
+Sometimes we invoke basic Unix commands via the shell when there is also a Ruby API for doing it. Use the Ruby API if it exists.
```ruby
# Wrong
@@ -30,12 +28,7 @@ This coding style could have prevented CVE-2013-4490.
## Bypass the shell by splitting commands into separate tokens
-When we pass shell commands as a single string to Ruby, Ruby will let `/bin/sh` evaluate the entire string.
-Essentially, we are asking the shell to evaluate a one-line script.
-This creates a risk for shell injection attacks.
-It is better to split the shell command into tokens ourselves.
-Sometimes we use the scripting capabilities of the shell to change the working directory or set environment variables.
-All of this can also be achieved securely straight from Ruby
+When we pass shell commands as a single string to Ruby, Ruby will let `/bin/sh` evaluate the entire string. Essentially, we are asking the shell to evaluate a one-line script. This creates a risk for shell injection attacks. It is better to split the shell command into tokens ourselves. Sometimes we use the scripting capabilities of the shell to change the working directory or set environment variables. All of this can also be achieved securely straight from Ruby
```ruby
# Wrong
@@ -55,8 +48,7 @@ This coding style could have prevented CVE-2013-4546.
## Separate options from arguments with --
-Make the difference between options and arguments clear to the argument parsers of system commands with `--`.
-This is supported by many but not all Unix commands.
+Make the difference between options and arguments clear to the argument parsers of system commands with `--`. This is supported by many but not all Unix commands.
To understand what `--` does, consider the problem below.
@@ -68,9 +60,7 @@ cat: illegal option -- l
usage: cat [-benstuv] [file ...]
```
-In the example above, the argument parser of `cat` assumes that `-l` is an option.
-The solution in the example above is to make it clear to `cat` that `-l` is really an argument, not an option.
-Many Unix command line tools follow the convention of separating options from arguments with `--`.
+In the example above, the argument parser of `cat` assumes that `-l` is an option. The solution in the example above is to make it clear to `cat` that `-l` is really an argument, not an option. Many Unix command line tools follow the convention of separating options from arguments with `--`.
```
# Example (continued)
@@ -91,9 +81,7 @@ This coding style could have prevented CVE-2013-4582.
## Do not use the backticks
-Capturing the output of shell commands with backticks reads nicely, but you are forced to pass the command as one string to the shell.
-We explained above that this is unsafe.
-In the main GitLab codebase, the solution is to use `Gitlab::Popen.popen` instead.
+Capturing the output of shell commands with backticks reads nicely, but you are forced to pass the command as one string to the shell. We explained above that this is unsafe. In the main GitLab codebase, the solution is to use `Gitlab::Popen.popen` instead.
```ruby
# Wrong
diff --git a/doc/install/README.md b/doc/install/README.md
index ec80e3cd62..239f5f301e 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -1,4 +1,6 @@
-+ [Installation](installation.md)
-+ [Requirements](requirements.md)
-+ [Structure](structure.md)
-+ [Database MySQL](database_mysql.md)
+# Installation
+
+- [Installation](installation.md)
+- [Requirements](requirements.md)
+- [Structure](structure.md)
+- [Database MySQL](database_mysql.md)
diff --git a/doc/install/database_mysql.md b/doc/install/database_mysql.md
index bf8183729e..270ad3b0b8 100644
--- a/doc/install/database_mysql.md
+++ b/doc/install/database_mysql.md
@@ -1,3 +1,5 @@
+# Database Mysql
+
## Note
We do not recommend using MySQL due to various issues. For example, case [(in)sensitivity](https://dev.mysql.com/doc/refman/5.0/en/case-sensitivity.html) and [problems](http://bugs.mysql.com/bug.php?id=65830) that [suggested](http://bugs.mysql.com/bug.php?id=50909) [fixes](http://bugs.mysql.com/bug.php?id=65830) [have](http://bugs.mysql.com/bug.php?id=63164).
diff --git a/doc/install/installation.md b/doc/install/installation.md
index c83ab83514..76ffffa013 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -1,12 +1,14 @@
-# Select Version to Install
-Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install. In most cases
-this should be the highest numbered stable branch (example shown below).
+# Installation
+
+## Select Version to Install
+
+Make sure you view [this installation guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) from the branch (version) of GitLab you would like to install. In most cases this should be the highest numbered stable branch (example shown below).
If the highest number stable branch is unclear please check the [GitLab Blog](https://www.gitlab.com/blog/) for installation guide links by version.
-# Important notes
+## Important notes
This guide is long because it covers many cases and includes all commands you need, this is [one of the few installation scripts that actually works out of the box](https://twitter.com/robinvdvleuten/status/424163226532986880).
@@ -18,21 +20,18 @@ The following steps have been known to work. Please **use caution when you devia
If you find a bug/error in this guide please **submit a merge request** following the [contributing guide](../../CONTRIBUTING.md).
-- - -
-
-# Overview
+## Overview
The GitLab installation consists of setting up the following components:
1. Packages / Dependencies
-2. Ruby
-3. System Users
-4. Database
-5. GitLab
-6. Nginx
+1. Ruby
+1. System Users
+1. Database
+1. GitLab
+1. Nginx
-
-# 1. Packages / Dependencies
+## 1. Packages / Dependencies
`sudo` is not installed on Debian by default. Make sure your system is
up-to-date and install it.
@@ -42,10 +41,7 @@ up-to-date and install it.
apt-get upgrade -y
apt-get install sudo -y
-**Note:**
-During this installation some files will need to be edited manually.
-If you are familiar with vim set it as default editor with the commands below.
-If you are not familiar with vim please skip this and keep using the default editor.
+**Note:** During this installation some files will need to be edited manually. If you are familiar with vim set it as default editor with the commands below. If you are not familiar with vim please skip this and keep using the default editor.
# Install vim and set as default editor
sudo apt-get install -y vim
@@ -53,14 +49,14 @@ If you are not familiar with vim please skip this and keep using the default edi
Install the required packages (needed to compile Ruby and native extensions to Ruby gems):
- sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate
+ sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils
Make sure you have the right version of Git installed
# Install Git
sudo apt-get install -y git-core
- # Make sure Git is version 1.7.10 or higher, for example 1.7.12 or 1.8.4
+ # Make sure Git is version 1.7.10 or higher, for example 1.7.12 or 2.0.0
git --version
Is the system packaged Git too old? Remove it and compile from source.
@@ -73,24 +69,22 @@ Is the system packaged Git too old? Remove it and compile from source.
# Download and compile from source
cd /tmp
- curl --progress https://git-core.googlecode.com/files/git-1.8.5.2.tar.gz | tar xz
- cd git-1.8.5.2/
+ curl --progress https://www.kernel.org/pub/software/scm/git/git-2.0.0.tar.gz | tar xz
+ cd git-2.0.0/
make prefix=/usr/local all
# Install into /usr/local/bin
sudo make prefix=/usr/local install
- # When editing config/gitlab.yml (Step 6), change the git bin_path to /usr/local/bin/git
+ # When editing config/gitlab.yml (Step 5), change the git bin_path to /usr/local/bin/git
-**Note:** In order to receive mail notifications, make sure to install a
-mail server. By default, Debian is shipped with exim4 whereas Ubuntu
-does not ship with one. The recommended mail server is postfix and you can install it with:
+**Note:** In order to receive mail notifications, make sure to install a mail server. By default, Debian is shipped with exim4 whereas Ubuntu does not ship with one. The recommended mail server is postfix and you can install it with:
sudo apt-get install -y postfix
Then select 'Internet Site' and press enter to confirm the hostname.
-# 2. Ruby
+## 2. Ruby
The use of ruby version managers such as [RVM](http://rvm.io/), [rbenv](https://github.com/sstephenson/rbenv) or [chruby](https://github.com/postmodern/chruby) with GitLab in production frequently leads to hard to diagnose problems. For example, GitLab Shell is called from OpenSSH and having a version manager can prevent pushing and pulling over SSH. Version managers are not supported and we stronly advise everyone to follow the instructions below to use a system ruby.
@@ -111,17 +105,15 @@ Install the Bundler Gem:
sudo gem install bundler --no-ri --no-rdoc
-
-# 3. System Users
+## 3. System Users
Create a `git` user for Gitlab:
sudo adduser --disabled-login --gecos 'GitLab' git
-# 4. Database
+## 4. Database
-We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md).
-NOTE: because we need to make use of extensions you need at least pgsql 9.1.
+We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](database_mysql.md). *Note*: because we need to make use of extensions you need at least pgsql 9.1.
# Install the database packages
sudo apt-get install -y postgresql-9.1 postgresql-client libpq-dev
@@ -141,13 +133,12 @@ NOTE: because we need to make use of extensions you need at least pgsql 9.1.
# Try connecting to the new database with the new user
sudo -u git -H psql -d gitlabhq_production
-
-# 5. GitLab
+## 5. GitLab
# We'll install GitLab into home directory of the user "git"
cd /home/git
-## Clone the Source
+### Clone the Source
# Clone GitLab repository
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 6-9-stable-ee gitlab
@@ -155,10 +146,9 @@ NOTE: because we need to make use of extensions you need at least pgsql 9.1.
# Go to gitlab dir
cd /home/git/gitlab
-**Note:**
-You can change `6-9-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `6-9-stable-ee` to `master` if you want the *bleeding edge* version, but never install master on a production server!
-## Configure it
+### Configure it
cd /home/git/gitlab
@@ -168,6 +158,8 @@ You can change `6-9-stable-ee` to `master` if you want the *bleeding edge* versi
# Make sure to change "localhost" to the fully-qualified domain name of your
# host serving GitLab where necessary
#
+ # If you want to use https make sure that you set `https` to `true`. See #using-https for all necessary details.
+ #
# If you installed Git from source, change the git bin_path to /usr/local/bin/git
sudo -u git -H editor config/gitlab.yml
@@ -179,7 +171,7 @@ You can change `6-9-stable-ee` to `master` if you want the *bleeding edge* versi
# Create directory for satellites
sudo -u git -H mkdir /home/git/gitlab-satellites
- sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
+ sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
# Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories
sudo chmod -R u+rwX tmp/pids/
@@ -204,10 +196,9 @@ You can change `6-9-stable-ee` to `master` if you want the *bleeding edge* versi
sudo -u git -H git config --global user.email "example@example.com"
sudo -u git -H git config --global core.autocrlf input
-**Important Note:**
-Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
+**Important Note:** Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
-## Configure GitLab DB settings
+### Configure GitLab DB settings
# PostgreSQL only:
sudo -u git cp config/database.yml.postgresql config/database.yml
@@ -227,14 +218,9 @@ Make sure to edit both `gitlab.yml` and `unicorn.rb` to match your setup.
# Make config/database.yml readable to git only
sudo -u git -H chmod o-rwx config/database.yml
-## Install Gems
+### Install Gems
-**Note:** As of bundler 1.5.2, you can invoke `bundle install -jN`
-(where `N` the number of your processor cores) and enjoy the parallel gems installation with measurable
-difference in completion time (~60% faster). Check the number of your cores with `nproc`.
-For more information check this [post](http://robots.thoughtbot.com/parallel-gem-installing-using-bundler).
-First make sure you have bundler >= 1.5.2 (run `bundle -v`) as it addresses some [issues](https://devcenter.heroku.com/changelog-items/411)
-that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2.
+**Note:** As of bundler 1.5.2, you can invoke `bundle install -jN` (where `N` the number of your processor cores) and enjoy the parallel gems installation with measurable difference in completion time (~60% faster). Check the number of your cores with `nproc`. For more information check this [post](http://robots.thoughtbot.com/parallel-gem-installing-using-bundler). First make sure you have bundler >= 1.5.2 (run `bundle -v`) as it addresses some [issues](https://devcenter.heroku.com/changelog-items/411) that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2.
cd /home/git/gitlab
@@ -244,7 +230,7 @@ that were [fixed](https://github.com/bundler/bundler/pull/2817) in 1.5.2.
# Or if you use MySQL (note, the option says "without ... postgres")
sudo -u git -H bundle install --deployment --without development test postgres aws
-## Install GitLab shell
+### Install GitLab shell
GitLab Shell is an ssh access and repository management software developed specially for GitLab.
@@ -252,13 +238,20 @@ GitLab Shell is an ssh access and repository management software developed speci
cd /home/git/gitlab
# Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
- sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.4] REDIS_URL=redis://localhost:6379 RAILS_ENV=production
+ sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.5] REDIS_URL=redis://localhost:6379 RAILS_ENV=production
- # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows:
+ # By default, the gitlab-shell config is generated from your main gitlab config.
+ #
+ # Note: When using GitLab with HTTPS please change the following:
+ # - Provide paths to the certificates under `ca_file` and `ca_path options.
+ # - The `gitlab_url` option must point to the https endpoint of GitLab.
+ # - In case you are using self signed certificate set `self_signed_cert` to `true`.
+ # See #using-https for all necessary details.
+ #
+ # You can review (and modify) the gitlab-shell config as follows:
sudo -u git -H editor /home/git/gitlab-shell/config.yml
-
-## Initialize Database and Activate Advanced Features
+### Initialize Database and Activate Advanced Features
sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production
@@ -266,7 +259,7 @@ GitLab Shell is an ssh access and repository management software developed speci
# When done you see 'Administrator account created:'
-## Install Init Script
+### Install Init Script
Download the init script (will be /etc/init.d/gitlab):
@@ -282,39 +275,36 @@ Make GitLab start on boot:
sudo update-rc.d gitlab defaults 21
-## Set up logrotate
+### Set up logrotate
sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
-## Check Application Status
+### Check Application Status
Check if GitLab and its environment are configured correctly:
sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
-## Compile assets
+### Compile assets
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
-## Start Your GitLab Instance
+### Start Your GitLab Instance
sudo service gitlab start
# or
sudo /etc/init.d/gitlab restart
+## 6. Nginx
-# 6. Nginx
+**Note:** Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the [GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/).
-**Note:**
-Nginx is the officially supported web server for GitLab. If you cannot or do not want to use Nginx as your web server, have a look at the
-[GitLab recipes](https://gitlab.com/gitlab-org/gitlab-recipes/).
-
-## Installation
+### Installation
sudo apt-get install -y nginx
-## Site Configuration
+### Site Configuration
-Download an example site config:
+Copy the example site config:
sudo cp lib/support/nginx/gitlab /etc/nginx/sites-available/gitlab
sudo ln -s /etc/nginx/sites-available/gitlab /etc/nginx/sites-enabled/gitlab
@@ -325,14 +315,15 @@ Make sure to edit the config file to match your setup:
# domain name of your host serving GitLab.
sudo editor /etc/nginx/sites-available/gitlab
-## Restart
+**Note:** If you want to use https, replace the `gitlab` nginx config with `gitlab-ssl`. See [Using HTTPS](#using-https) for all necessary details.
+
+### Restart
sudo service nginx restart
+## Done!
-# Done!
-
-## Double-check Application Status
+### Double-check Application Status
To make sure you didn't miss anything run a more thorough check with:
@@ -340,51 +331,44 @@ To make sure you didn't miss anything run a more thorough check with:
If all items are green, then congratulations on successfully installing GitLab!
-## Initial Login
+### Initial Login
-Visit YOUR_SERVER in your web browser for your first GitLab login.
-The setup has created an admin account for you. You can use it to log in:
+Visit YOUR_SERVER in your web browser for your first GitLab login. The setup has created an admin account for you. You can use it to log in:
root
5iveL!fe
-**Important Note:**
-Please go over to your profile page and immediately change the password, so
-nobody can access your GitLab by using this login information later on.
+**Important Note:** Please go over to your profile page and immediately change the password, so nobody can access your GitLab by using this login information later on.
**Enjoy!**
+## Advanced Setup Tips
-- - -
+### Using HTTPS
+To recapitulate what is needed to use GitLab with HTTPS:
-# Advanced Setup Tips
+1. In `gitlab.yml` set the `https` option to `true`
+1. In the `config.yml` of gitlab-shell set the relevant options (see the [install GitLab Shell section](#install-gitlab-shell) of this document).
+1. Use the `gitlab-ssl` nginx example config instead of the `gitlab` config.
-## Additional markup styles
+### Additional markup styles
-Apart from the always supported markdown style there are other rich text files that GitLab can display.
-But you might have to install a dependency to do so.
-Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
-For example, reStructuredText markup language support requires python-docutils:
+Apart from the always supported markdown style there are other rich text files that GitLab can display. But you might have to install a dependency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
- sudo apt-get install -y python-docutils
+### Custom Redis Connection
-## Custom Redis Connection
-
-If you'd like Resque to connect to a Redis server on a non-standard port or on
-a different host, you can configure its connection string via the
-`config/resque.yml` file.
+If you'd like Resque to connect to a Redis server on a non-standard port or on a different host, you can configure its connection string via the `config/resque.yml` file.
# example
production: redis://redis.example.tld:6379
-If you want to connect the Redis server via socket, then use the "unix:" URL scheme
-and the path to the Redis socket file in the `config/resque.yml` file.
+If you want to connect the Redis server via socket, then use the "unix:" URL scheme and the path to the Redis socket file in the `config/resque.yml` file.
# example
production: unix:/path/to/redis/socket
-## Custom SSH Connection
+### Custom SSH Connection
If you are running SSH on a non-standard port, you must change the gitlab user's SSH config.
@@ -396,39 +380,44 @@ If you are running SSH on a non-standard port, you must change the gitlab user's
You also need to change the corresponding options (e.g. ssh_user, ssh_host, admin_uri) in the `config\gitlab.yml` file.
-## LDAP authentication
+### LDAP authentication
You can configure LDAP authentication in config/gitlab.yml. Please restart GitLab after editing this file.
-## Using Custom Omniauth Providers
+### Using Custom Omniauth Providers
GitLab uses [Omniauth](http://www.omniauth.org/) for authentication and already ships with a few providers preinstalled (e.g. LDAP, GitHub, Twitter). But sometimes that is not enough and you need to integrate with other authentication solutions. For these cases you can use the Omniauth provider.
-### Steps
+#### Steps
These steps are fairly general and you will need to figure out the exact details from the Omniauth provider's documentation.
-* Stop GitLab
- `sudo service gitlab stop`
+- Stop GitLab:
-* Add provider specific configuration options to your `config/gitlab.yml` (you can use the [auth providers section of the example config](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example) as a reference)
+ sudo service gitlab stop
-* Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile)
- `gem "omniauth-your-auth-provider"`
-* If you're using MySQL, install the new Omniauth provider gem by running the following command:
- `sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment`
+- Add the gem to your [Gemfile](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/Gemfile):
-* If you're using PostgreSQL, install the new Omniauth provider gem by running the following command:
- `sudo -u git -H bundle install --without development test mysql --path vendor/bundle --no-deployment`
+ gem "omniauth-your-auth-provider"
-> These are the same commands you used in the [Install Gems section](#install-gems) with `--path vendor/bundle --no-deployment` instead of `--deployment`.
+- If you're using MySQL, install the new Omniauth provider gem by running the following command:
-* Start GitLab
- `sudo service gitlab start`
+ sudo -u git -H bundle install --without development test postgres --path vendor/bundle --no-deployment
+- If you're using PostgreSQL, install the new Omniauth provider gem by running the following command:
-### Examples
+ sudo -u git -H bundle install --without development test mysql --path vendor/bundle --no-deployment
+
+ > These are the same commands you used in the [Install Gems section](#install-gems) with `--path vendor/bundle --no-deployment` instead of `--deployment`.
+
+- Start GitLab:
+
+ `sudo service gitlab start`
+
+#### Examples
If you have successfully set up a provider that is not shipped with GitLab itself, please let us know.
+
You can help others by reporting successful configurations and probably share a few insights or provide warnings for common errors or pitfalls by sharing your experience [in the public Wiki](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations).
+
While we can't officially support every possible auth mechanism out there, we'd like to at least help those with special needs.
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index fd2dd16cd8..d7c4c4da2e 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -1,8 +1,10 @@
-# Operating Systems
+# Requirements
+
+## Operating Systems
GitLab is developed for the Linux operating system. For the installations options and instructions please see [the installation section of the readme](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/README.md#installation).
-## Supported Linux distributions
+### Supported Linux distributions
- Ubuntu
- Debian
@@ -11,50 +13,54 @@ GitLab is developed for the Linux operating system. For the installations option
- Scientific Linux
- Oracle Linux
-## Unsupported Linux distributions
+### Unsupported Linux distributions
- Arch Linux
- Fedora
- Gentoo
-But on the above unsupported distributions is stll possible to install GitLab yourself with the [manual installation guide](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md).
+But on the above unsupported distributions is still possible to install GitLab yourself with the [manual installation guide](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md).
-## Unsupported Unix operating systems
+### Unsupported Unix operating systems
There is nothing that prevents GitLab from running on other Unix operating systems.
+
This means you may get it to work on systems running FreeBSD or OS X.
+
If you want to do this, please be aware it could be a lot of work.
+
Please consider using a virtual machine to run GitLab.
-## Other operating systems such as Windows
+### Other operating systems such as Windows
GitLab does **not** run on Windows and we have no plans of supporting it in the near future.
+
Please consider using a virtual machine to run GitLab.
+## Ruby versions
-# Ruby versions
+GitLab requires Ruby (MRI) 2.0 or 2.1
-GitLab requires Ruby (MRI) 1.9.3 or 2.0+.
You will have to use the standard MRI implementation of Ruby.
+
We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.
+## Hardware requirements
-# Hardware requirements
-
-## CPU
+### CPU
- 1 core works supports up to 100 users but the application will not be responsive
- **2 cores** is the **recommended** number of cores and supports up to 500 users
- 4 cores supports up to 2,000 users
- 8 cores supports up to 5,000 users
-- 16 cores supports up to 10,0000 users
-- 32 cores supports up to 20,0000 users
-- 64 cores supports up to 40,0000 users
+- 16 cores supports up to 10,000 users
+- 32 cores supports up to 20,000 users
+- 64 cores supports up to 40,000 users
-## Memory
+### Memory
-- 512MB is the absolute minimum, you need 256MB of swap, you can configure only one slow unicorn worker, only ssh access will work, we do not recommend this
-- 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates using swap space)
+- 512MB is the absolute minimum but we do not recommend this amount of memory, you'll need to configure a minimum swap of 256MB, you're memory will only allow you to run one slow unicorn worker, things will case only git ssh access to work because the git http access requires two running workers (one to receive the user request and one for the authorization check),
+- 1GB supports up to 100 users (with individual repositories under 250MB, otherwise git memory usage necessitates configuring swap space)
- **2GB** is the **recommended** memory size and supports up to 500 users
- 4GB supports up to 2,000 users
- 8GB supports up to 5,000 users
@@ -62,11 +68,9 @@ We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab
- 32GB supports up to 20,000 users
- 64GB supports up to 40,000 users
-## Storage
+### Storage
-The necessary hard drive space largely depends on the size of the repos you want
-to store in GitLab. But as a *rule of thumb* you should have at least twice as much
-free space as your all repos combined take up. You need twice the storage because [GitLab satellites](structure.md) contain an extra copy of each repo.
+The necessary hard drive space largely depends on the size of the repos you want to store in GitLab. But as a *rule of thumb* you should have at least twice as much free space as your all repos combined take up. You need twice the storage because [GitLab satellites](structure.md) contain an extra copy of each repo.
If you want to be flexible about growing your hard drive space in the future consider mounting it using LVM so you can add more hard drives when you need them.
@@ -78,7 +82,7 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim
If you want to run the database separately, the **recommended** database size is **1 MB per user**
-# Supported webbrowsers
+## Supported webbrowsers
- Chrome (Latest stable version)
- Firefox (Latest released version)
diff --git a/doc/integration/README.md b/doc/integration/README.md
index 657dacd005..cd32278a89 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -1,11 +1,13 @@
# GitLab Integration
GitLab integrates with multiple third-party services to allow external issue trackers and external authentication.
+
See the documentation below for details on how to configure these services.
-+ [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc.
-+ [LDAP](ldap.md) Set up sign in via LDAP
-+ [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, and Google via OAuth.
-+ [Slack](slack.md) Integrate with the Slack chat service
-+ [Jenkins](jenkins.md) Integrate with the Jenkins CI
-+ [Jira](jira.md) Integrate with the JIRA issue tracker
+- [External issue tracker](external-issue-tracker.md) Redmine, JIRA, etc.
+- [LDAP](ldap.md) Set up sign in via LDAP
+- [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, and Google via OAuth.
+- [Slack](slack.md) Integrate with the Slack chat service
+- [Jenkins](jenkins.md) Integrate with the Jenkins CI
+- [Jira](jira.md) Integrate with the JIRA issue tracker
+- [Slack](slack.md) Integrate with the Slack chat service
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index e490b2f884..7efbf118d4 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -1,3 +1,5 @@
+# External issue tracker
+
GitLab has a great issue tracker but you can also use an external issue tracker such as JIRA or Redmine. This is something that you can turn on per GitLab project. If for example you configure JIRA it provides the following functionality:
- the 'Issues' link on the GitLab project pages takes you to the appropriate JIRA issue index;
diff --git a/doc/integration/github.md b/doc/integration/github.md
index 672536b4da..b53a7c1285 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -2,18 +2,24 @@
To enable the GitHub OmniAuth provider you must register your application with GitHub. GitHub will generate a client ID and secret key for you to use.
-1. Sign in to GitHub.
-2. Navigate to your individual user settings or an organization's settings, depending on how you want the application registered. It does not matter if the application is registered as an individual or an organization - that is entirely up to you.
-3. Select "Applications" in the left menu.
-4. Select "Register new application".
-5. Provide the required details.
- * Application name: This can be anything. Consider something like "\'s GitLab" or "\'s GitLab" or something else descriptive.
- * Homepage URL: The URL to your GitLab installation. 'https://gitlab.company.com'
- * Application description: Fill this in if you wish.
- * Authorization callback URL: 'https://gitlab.company.com/users/auth/github/callback'
-6. Select "Register application".
-7. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. 
-8. On your GitLab server, open the configuration file.
+1. Sign in to GitHub.
+
+1. Navigate to your individual user settings or an organization's settings, depending on how you want the application registered. It does not matter if the application is registered as an individual or an organization - that is entirely up to you.
+
+1. Select "Applications" in the left menu.
+
+1. Select "Register new application".
+
+1. Provide the required details.
+ - Application name: This can be anything. Consider something like "\'s GitLab" or "\'s GitLab" or something else descriptive.
+ - Homepage URL: The URL to your GitLab installation. 'https://gitlab.company.com'
+ - Application description: Fill this in if you wish.
+ - Authorization callback URL: 'https://gitlab.company.com/users/auth/github/callback'
+1. Select "Register application".
+
+1. You should now see a Client ID and Client Secret near the top right of the page (see screenshot). Keep this page open as you continue configuration. 
+
+1. On your GitLab server, open the configuration file.
```sh
cd /home/git/gitlab
@@ -21,8 +27,9 @@ To enable the GitHub OmniAuth provider you must register your application with G
sudo -u git -H editor config/gitlab.yml
```
-9. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for more details.
-10. Under `providers:` uncomment (or add) lines that look like the following:
+1. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for more details.
+
+1. Under `providers:` uncomment (or add) lines that look like the following:
```
- { name: 'github', app_id: 'YOUR APP ID',
@@ -30,9 +37,12 @@ To enable the GitHub OmniAuth provider you must register your application with G
args: { scope: 'user:email' } }
```
-11. Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
-12. Change 'YOUR APP SECRET' to the client secret from the GitHub application page from step 7.
-13. Save the configuration file.
-14. Restart GitLab for the changes to take effect.
+1. Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
+
+1. Change 'YOUR APP SECRET' to the client secret from the GitHub application page from step 7.
+
+1. Save the configuration file.
+
+1. Restart GitLab for the changes to take effect.
On the sign in page there should now be a GitHub icon below the regular sign in form. Click the icon to begin the authentication process. GitHub will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in.
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 50f63502e7..3cf546bd77 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -2,28 +2,38 @@
To enable the Google OAuth2 OmniAuth provider you must register your application with Google. Google will generate a client ID and secret key for you to use.
-1. Sign in to the [Google Developers Console](https://console.developers.google.com/) with the Google account you want to use to register GitLab.
-2. Select "Create Project".
-3. Provide the project information
- * Project name: 'GitLab' works just fine here.
- * Project ID: Must be unique to all Google Developer registered applications. Google provides a randomly generated Project ID by default. You can use the randomly generated ID or choose a new one.
-4. Refresh the page. You should now see your new project in the list. Click on the project.
-5. Select "APIs & auth" in the left menu.
-6. Select "Credentials" in the submenu.
-7. Select "Create New Client ID".
-8. Fill in the required information
- * Application type: "Web Application"
- * Authorized JavaScript origins: This isn't really used by GitLab but go ahead and put 'https://gitlab.example.com' here.
- * Authorized redirect URI: 'https://gitlab.example.com/users/auth/google_oauth2/callback'
-9. Under the heading "Client ID for web application" you should see a Client ID and Client secret (see screenshot). Keep this page open as you continue configuration. 
-10. On your GitLab server, open the configuration file.
+1. Sign in to the [Google Developers Console](https://console.developers.google.com/) with the Google account you want to use to register GitLab.
+
+1. Select "Create Project".
+
+1. Provide the project information
+ - Project name: 'GitLab' works just fine here.
+ - Project ID: Must be unique to all Google Developer registered applications. Google provides a randomly generated Project ID by default. You can use the randomly generated ID or choose a new one.
+1. Refresh the page. You should now see your new project in the list. Click on the project.
+
+1. Select "APIs & auth" in the left menu.
+
+1. Select "Credentials" in the submenu.
+
+1. Select "Create New Client ID".
+
+1. Fill in the required information
+ - Application type: "Web Application"
+ - Authorized JavaScript origins: This isn't really used by GitLab but go ahead and put 'https://gitlab.example.com' here.
+ - Authorized redirect URI: 'https://gitlab.example.com/users/auth/google_oauth2/callback'
+1. Under the heading "Client ID for web application" you should see a Client ID and Client secret (see screenshot). Keep this page open as you continue configuration. 
+
+1. On your GitLab server, open the configuration file.
+
```sh
cd /home/git/gitlab
sudo -u git -H editor config/gitlab.yml
```
-11. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for more details.
-12. Under `providers:` uncomment (or add) lines that look like the following:
+
+1. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration) for more details.
+
+1. Under `providers:` uncomment (or add) lines that look like the following:
```
- { name: 'google_oauth2', app_id: 'YOUR APP ID',
@@ -31,10 +41,13 @@ To enable the Google OAuth2 OmniAuth provider you must register your application
args: { access_type: 'offline', approval_prompt: '' } }
```
-13. Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
-14. Change 'YOUR APP SECRET' to the client secret from the GitHub application page from step 7.
-15. Save the configuration file.
-16. Restart GitLab for the changes to take effect.
+1. Change 'YOUR APP ID' to the client ID from the GitHub application page from step 7.
+
+1. Change 'YOUR APP SECRET' to the client secret from the GitHub application page from step 7.
+
+1. Save the configuration file.
+
+1. Restart GitLab for the changes to take effect.
On the sign in page there should now be a Google icon below the regular sign in form. Click the icon to begin the authentication process. Google will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in.
@@ -45,5 +58,5 @@ This further configuration is not required for Google authentication to function
At this point, when users first try to authenticate to your GitLab installation with Google they will see a generic application name on the prompt screen. The prompt informs the user that "Project Default Service Account" would like to access their account. "Project Default Service Account" isn't very recognizable and may confuse or cause users to be concerned. This is easily changeable.
1. Select 'Consent screen' in the left menu. (See steps 1, 4 and 5 above for instructions on how to get here if you closed your window).
-2. Scroll down until you find "Product Name". Change the product name to something more descriptive.
-3. Add any additional information as you wish - homepage, logo, privacy policy, etc. None of this is required, but it may help your users.
+1. Scroll down until you find "Product Name". Change the product name to something more descriptive.
+1. Add any additional information as you wish - homepage, logo, privacy policy, etc. None of this is required, but it may help your users.
diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md
index b52c4a4b5e..62bb957d95 100644
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
@@ -1,14 +1,19 @@
# GitLab LDAP integration
GitLab can be configured to allow your users to sign with their LDAP credentials to integrate with e.g. Active Directory.
+
The first time a user signs in with LDAP credentials, GitLab will create a new GitLab user associated with the LDAP Distinguished Name (DN) of the LDAP user.
+
GitLab user attributes such as nickname and email will be copied from the LDAP user entry.
## Enabling LDAP sign-in for existing GitLab users
When a user signs in to GitLab with LDAP for the first time, and their LDAP email address is the primary email address of an existing GitLab user, then the LDAP DN will be associated with the existing user.
+
If the LDAP email attribute is not found in GitLab's database, a new user is created.
In other words, if an existing GitLab user wants to enable LDAP sign-in for themselves, they should check that their GitLab email address matches their LDAP email address, and then sign into GitLab via their LDAP credentials.
+
GitLab recognizes the following LDAP attributes as email addresses: `mail`, `email` and `userPrincipalName`.
+
If multiple LDAP email attributes are present, e.g. `mail: foo@bar.com` and `email: foo@example.com`, then the first attribute found wins -- in this case `foo@bar.com`.
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 84a5a8e8c2..1b0bf9c5f6 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -1,18 +1,18 @@
# OmniAuth
GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and other popular services. Configuring
-OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can
-choose to sign in using any of the configured mechanisms.
-+ [Initial OmniAuth Configuration](#initial-omniauth-configuration)
-+ [Supported Providers](#supported-providers)
-+ [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user)
+OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can choose to sign in using any of the configured mechanisms.
-### Initial OmniAuth Configuration
+- [Initial OmniAuth Configuration](#initial-omniauth-configuration)
+- [Supported Providers](#supported-providers)
+- [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user)
+
+## Initial OmniAuth Configuration
Before configuring individual OmniAuth providers there are a few global settings that need to be verified.
-1. Open the configuration file's GitLab" or "\'s GitLab" or
+1. Sign in to [Twitter Developers](https://dev.twitter.com/) area.
+
+1. Hover over the avatar in the top right corner and select "My applications."
+
+1. Select "Create new app"
+
+1. Fill in the application details.
+ - Name: This can be anything. Consider something like "\'s GitLab" or "\'s GitLab" or
something else descriptive.
- * Description: Create a description.
- * Website: The URL to your GitLab installation. 'https://gitlab.example.com'
- * Callback URL: 'https://gitlab.example.com/users/auth/github/callback'
- * Agree to the "Rules of the Road."
+ - Description: Create a description.
+ - Website: The URL to your GitLab installation. 'https://gitlab.example.com'
+ - Callback URL: 'https://gitlab.example.com/users/auth/github/callback'
+ - Agree to the "Rules of the Road."
+
-6. Select "Create your Twitter application."
-7. Select the "Settings" tab.
-8. Underneath the Callback URL check the box next to "Allow this application to be used to Sign in the Twitter."
-9. Select "Update settings" at the bottom to save changes.
-10. Select the "API Keys" tab.
-11. You should now see an API key and API secret (see screenshot). Keep this page open as you continue configuration.
-
-12. On your GitLab server, open the configuration file.
+1. Select "Create your Twitter application."
+
+1. Select the "Settings" tab.
+
+1. Underneath the Callback URL check the box next to "Allow this application to be used to Sign in the Twitter."
+
+1. Select "Update settings" at the bottom to save changes.
+
+1. Select the "API Keys" tab.
+
+1. You should now see an API key and API secret (see screenshot). Keep this page open as you continue configuration.
+
+ 
+
+1. On your GitLab server, open the configuration file.
```sh
cd /home/git/gitlab
@@ -29,19 +39,22 @@ ID and secret key for you to use.
sudo -u git -H editor config/gitlab.yml
```
-13. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration)
+1. Find the section dealing with OmniAuth. See [Initial OmniAuth Configuration](README.md#initial-omniauth-configuration)
for more details.
-14. Under `providers:` uncomment (or add) lines that look like the following:
+
+1. Under `providers:` uncomment (or add) lines that look like the following:
```
- { name: 'twitter', app_id: 'YOUR APP ID',
app_secret: 'YOUR APP SECRET' }
```
-15. Change 'YOUR APP ID' to the API key from Twitter page in step 11.
-16. Change 'YOUR APP SECRET' to the API secret from the Twitter page in step 11.
-17. Save the configuration file.
-18. Restart GitLab for the changes to take effect.
+1. Change 'YOUR APP ID' to the API key from Twitter page in step 11.
-On the sign in page there should now be a Twitter icon below the regular sign in form. Click the icon to begin the
-authentication process. Twitter will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in.
+1. Change 'YOUR APP SECRET' to the API secret from the Twitter page in step 11.
+
+1. Save the configuration file.
+
+1. Restart GitLab for the changes to take effect.
+
+On the sign in page there should now be a Twitter icon below the regular sign in form. Click the icon to begin the authentication process. Twitter will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in.
diff --git a/doc/legal/README.md b/doc/legal/README.md
index ebfdad1354..56d72ae385 100644
--- a/doc/legal/README.md
+++ b/doc/legal/README.md
@@ -1,2 +1,4 @@
-+ [Corporate contributor license agreement](corporate_contributor_license_agreement.md)
-+ [Individual contributor license agreement](individual_contributor_license_agreement.md)
+# Legal
+
+- [Corporate contributor license agreement](corporate_contributor_license_agreement.md)
+- [Individual contributor license agreement](individual_contributor_license_agreement.md)
diff --git a/doc/legal/corporate_contributor_license_agreement.md b/doc/legal/corporate_contributor_license_agreement.md
index bbc274f3b0..13bf15fcf4 100644
--- a/doc/legal/corporate_contributor_license_agreement.md
+++ b/doc/legal/corporate_contributor_license_agreement.md
@@ -1,25 +1,25 @@
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to GitLab.com. Except for the license granted herein to GitLab.com and recipients of software distributed by GitLab.com, You reserve all right, title, and interest in and to Your Contributions.
+# Corporate contributor license agreement
-1. Definitions.
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to GitLab B.V.. Except for the license granted herein to GitLab B.V. and recipients of software distributed by GitLab B.V., You reserve all right, title, and interest in and to Your Contributions.
- "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with GitLab.com. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+1. Definitions.
- "Contribution" shall mean the code, documentation or other original works of authorship expressly identified in Schedule B, as well as any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to GitLab.com for inclusion in, or documentation of, any of the products owned or managed by GitLab.com (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to GitLab.com or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, GitLab.com for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+ "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with GitLab B.V.. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab.com and to recipients of software distributed by GitLab.com a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
+ "Contribution" shall mean the code, documentation or other original works of authorship expressly identified in Schedule B, as well as any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to GitLab B.V. for inclusion in, or documentation of, any of the products owned or managed by GitLab B.V. (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to GitLab B.V. or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, GitLab B.V. for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
-3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab.com and to recipients of software distributed by GitLab.com a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab B.V. and to recipients of software distributed by GitLab B.V. a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
-4. You represent that You are legally entitled to grant the above license. You represent further that each employee of the Corporation designated on Schedule A below (or in a subsequent written modification to that Schedule) is authorized to submit Contributions on behalf of the Corporation.
+3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab B.V. and to recipients of software distributed by GitLab B.V. a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
-5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others).
+4. You represent that You are legally entitled to grant the above license. You represent further that each employee of the Corporation designated on Schedule A below (or in a subsequent written modification to that Schedule) is authorized to submit Contributions on behalf of the Corporation.
-6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others).
-7. Should You wish to submit work that is not Your original creation, You may submit it to GitLab.com separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
+6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
-8. It is your responsibility to notify GitLab.com when any change is required to the list of designated employees authorized to submit Contributions on behalf of the Corporation, or to the Corporation's Point of Contact with GitLab.com.
+7. Should You wish to submit work that is not Your original creation, You may submit it to GitLab B.V. separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
----------------------------------------
+8. It is your responsibility to notify GitLab B.V. when any change is required to the list of designated employees authorized to submit Contributions on behalf of the Corporation, or to the Corporation's Point of Contact with GitLab B.V..
This text is licensed under the [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/) and the original source is the Google Open Source Programs Office.
diff --git a/doc/legal/individual_contributor_license_agreement.md b/doc/legal/individual_contributor_license_agreement.md
index eaf5812ca4..72b01433dd 100644
--- a/doc/legal/individual_contributor_license_agreement.md
+++ b/doc/legal/individual_contributor_license_agreement.md
@@ -1,25 +1,25 @@
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to GitLab.com. Except for the license granted herein to GitLab.com and recipients of software distributed by GitLab.com, You reserve all right, title, and interest in and to Your Contributions.
+# Individual contributor license agreement
-1. Definitions.
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to GitLab B.V.. Except for the license granted herein to GitLab B.V. and recipients of software distributed by GitLab B.V., You reserve all right, title, and interest in and to Your Contributions.
- "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with GitLab.com. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+1. Definitions.
- "Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to GitLab.com for inclusion in, or documentation of, any of the products owned or managed by GitLab.com (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to GitLab.com or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, GitLab.com for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+ "You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with GitLab B.V.. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab.com and to recipients of software distributed by GitLab.com a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
+ "Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to GitLab B.V. for inclusion in, or documentation of, any of the products owned or managed by GitLab B.V. (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to GitLab B.V. or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, GitLab B.V. for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
-3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab.com and to recipients of software distributed by GitLab.com a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab B.V. and to recipients of software distributed by GitLab B.V. a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
-4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to GitLab.com, or that your employer has executed a separate Corporate CLA with GitLab.com.
+3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to GitLab B.V. and to recipients of software distributed by GitLab B.V. a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
-5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
+4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to GitLab B.V., or that your employer has executed a separate Corporate CLA with GitLab B.V..
-6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
-7. Should You wish to submit work that is not Your original creation, You may submit it to GitLab.com separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [[]named here]".
+6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
-8. You agree to notify GitLab.com of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.
+7. Should You wish to submit work that is not Your original creation, You may submit it to GitLab B.V. separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [[]named here]".
----------------------------------------
+8. You agree to notify GitLab B.V. of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.
This text is licensed under the [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/) and the original source is the Google Open Source Programs Office.
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index e7ebc61343..64f571b435 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -1,9 +1,6 @@
-----------------------------------------------
+# Markdown
-Table of Contents
-=================
-
-----------------------------------------------
+## Table of Contents
**[GitLab Flavored Markdown](#gitlab-flavored-markdown-gfm)**
@@ -19,7 +16,6 @@ Table of Contents
[Special GitLab references](#special-gitlab-references)
-
**[Standard Markdown](#standard-markdown)**
[Headers](#headers)
@@ -44,29 +40,23 @@ Table of Contents
**[References](#references)**
-----------------------------------------------
+## GitLab Flavored Markdown (GFM)
-GitLab Flavored Markdown (GFM)
-==============================
-For GitLab we developed something we call "GitLab Flavored Markdown" (GFM).
-It extends the standard Markdown in a few significant ways to add some useful functionality.
+For GitLab we developed something we call "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality.
You can use GFM in
-* commit messages
-* comments
-* wall posts
-* issues
-* merge requests
-* milestones
-* wiki pages
+- commit messages
+- comments
+- issues
+- merge requests
+- milestones
+- wiki pages
-You can also use other rich text files in GitLab.
-You might have to install a depency to do so.
-Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
+You can also use other rich text files in GitLab. You might have to install a depency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
+
+## Newlines
-Newlines
---------
GFM honors the markdown specification in how [paragraphs and line breaks are handled](http://daringfireball.net/projects/markdown/syntax#p).
A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines.:
@@ -81,8 +71,8 @@ Violets are blue
Sugar is sweet
-Multiple underscores in words
------------------------------
+## Multiple underscores in words
+
It is not reasonable to italicize just _part_ of a word, especially when you're dealing with code and names that often appear with multiple underscores. Therefore, GFM ignores multiple underscores in words.
perform_complicated_task
@@ -91,10 +81,9 @@ It is not reasonable to italicize just _part_ of a word, especially when you're
perform_complicated_task
do_this_and_do_that_and_another_thing
-URL autolinking
----------------
-GFM will autolink standard URLs you copy and paste into your text.
-So if you want to link to a URL (instead of a textural link), you can simply put the URL in verbatim and it will be turned into a link to that URL.
+## URL autolinking
+
+GFM will autolink standard URLs you copy and paste into your text. So if you want to link to a URL (instead of a textural link), you can simply put the URL in verbatim and it will be turned into a link to that URL.
http://www.google.com
@@ -162,8 +151,7 @@ s = "There is no highlighting for this."
But let's throw in a tag .
```
-Emoji
------
+## Emoji
Sometimes you want to be :cool: and add some :sparkles: to your :speech_balloon:. Well we have a :gift: for you:
@@ -185,26 +173,25 @@ If you are :new: to this, don't be :fearful:. You can easily join the emoji :cir
Consult the [Emoji Cheat Sheet](http://www.emoji-cheat-sheet.com/) for a list of all supported emoji codes. :thumbsup:
-Special GitLab References
------
+## Special GitLab References
GFM recognized special references.
+
You can easily reference e.g. a team member, an issue, or a commit within a project.
+
GFM will turn that reference into a link so you can navigate between them easily.
GFM will recognize the following:
-* @foo : for team members
-* #123 : for issues
-* !123 : for merge requests
-* $123 : for snippets
-* 1234567 : for commits
-* \[file\](path/to/file) : for file references
+- @foo : for team members
+- #123 : for issues
+- !123 : for merge requests
+- $123 : for snippets
+- 1234567 : for commits
+- \[file\](path/to/file) : for file references
-----------------------------------
# Standard Markdown
-----------------------------------
## Headers
```no-highlight
@@ -247,12 +234,12 @@ On hover a link to those IDs becomes visible to make it easier to copy the link
The IDs are generated from the content of the header according to the following rules:
-1) remove the heading hashes `#` and process the rest of the line as it would be processed if it were not a header
-2) from the result, remove all HTML tags, but keep their inner content
-3) convert all characters to lowercase
-4) convert all characters except `[a-z0-9_-]` into hyphens `-`
-5) transform multiple adjacent hyphens into a single hyphen
-6) remove trailing and heading hyphens
+1. remove the heading hashes `#` and process the rest of the line as it would be processed if it were not a header
+2. from the result, remove all HTML tags, but keep their inner content
+3. convert all characters to lowercase
+4. convert all characters except `[a-z0-9_-]` into hyphens `-`
+5. transform multiple adjacent hyphens into a single hyphen
+6. remove trailing and heading hyphens
For example:
@@ -375,8 +362,7 @@ Some text to show that the reference links can follow later.
**Note**
-Relative links do not allow referencing project files in a wiki page or wiki page in a project file.
-The reason for this is that, in GitLab, wiki is always a separate git repository. For example:
+Relative links do not allow referencing project files in a wiki page or wiki page in a project file. The reason for this is that, in GitLab, wiki is always a separate git repository. For example:
`[I'm a reference-style link][style]`
@@ -397,9 +383,11 @@ will point the link to `wikis/style` when the link is inside of a wiki markdown
Here's our logo:
Inline-style:
+
Reference-style:
+
![alt text][logo]
[logo]: /assets/logo-white.png
@@ -516,10 +504,8 @@ Code above produces next output:
| cell 1 | cell 2 |
| cell 3 | cell 4 |
-------------
-
## References
-* This document leveraged heavily from the [Markdown-Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
-* The [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) at Daring Fireball is an excellent resource for a detailed explanation of standard markdown.
-* [Dillinger.io](http://dillinger.io) is a handy tool for testing standard markdown.
+- This document leveraged heavily from the [Markdown-Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet).
+- The [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) at Daring Fireball is an excellent resource for a detailed explanation of standard markdown.
+- [Dillinger.io](http://dillinger.io) is a handy tool for testing standard markdown.
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index 9be6423f66..e01b02212b 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -1,45 +1,47 @@
+# Permissions
+
Users have different abilities depending on the access level they have in a particular group or project.
+
If a user is both in a project group and in the project itself, the highest permission level is used.
+
If a user is a GitLab administrator they receive all permissions.
----
-
-#### Project:
+## Project
-| Action| Guest | Reporter | Developer | Master | Owner|
-|-------|-------|----------|-----------|--------|------|
-|Create new issue|✓|✓|✓|✓|✓|
-|Leave comments|✓|✓|✓|✓|✓|
-|Write on project wall|✓|✓|✓|✓|✓|
-|Pull project code| |✓|✓|✓|✓|
-|Download project| |✓|✓|✓|✓|
-|Create code snippets| |✓|✓|✓|✓|
-|Create new merge request| ||✓|✓|✓|
-|Create new branches| ||✓|✓|✓|
-|Push to non-protected branches| ||✓|✓|✓|
-|Remove non-protected branches| ||✓|✓|✓|
-|Add tags| ||✓|✓|✓|
-|Write a wiki| ||✓|✓|✓|
-|Manage issue tracker| ||✓|✓|✓|
-|Add new team members| |||✓|✓|
-|Push to protected branches| |||✓|✓|
-|Remove protected branches| |||✓|✓|
-|Edit project| |||✓|✓|
-|Add Deploy Keys to project| |||✓|✓|
-|Configure Project Hooks| |||✓|✓|
-|Switch visibility level| ||||✓|
-|Transfer project to another namespace| ||||✓|
-|Remove project| ||||✓|
+| Action | Guest | Reporter | Developer | Master | Owner |
+|---------------------------------------|---------|------------|-------------|----------|--------|
+| Create new issue | ✓ | ✓ | ✓ | ✓ | ✓ |
+| Leave comments | ✓ | ✓ | ✓ | ✓ | ✓ |
+| Pull project code | | ✓ | ✓ | ✓ | ✓ |
+| Download project | | ✓ | ✓ | ✓ | ✓ |
+| Create code snippets | | ✓ | ✓ | ✓ | ✓ |
+| Create new merge request | | | ✓ | ✓ | ✓ |
+| Create new branches | | | ✓ | ✓ | ✓ |
+| Push to non-protected branches | | | ✓ | ✓ | ✓ |
+| Remove non-protected branches | | | ✓ | ✓ | ✓ |
+| Add tags | | | ✓ | ✓ | ✓ |
+| Write a wiki | | | ✓ | ✓ | ✓ |
+| Manage issue tracker | | | ✓ | ✓ | ✓ |
+| Add new team members | | | | ✓ | ✓ |
+| Push to protected branches | | | | ✓ | ✓ |
+| Enable/Disable branch protection | | | | ✓ | ✓ |
+| Rewrite/remove git tags | | | | ✓ | ✓ |
+| Edit project | | | | ✓ | ✓ |
+| Add Deploy Keys to project | | | | ✓ | ✓ |
+| Configure Project Hooks | | | | ✓ | ✓ |
+| Switch visibility level | | | | | ✓ |
+| Transfer project to another namespace | | | | | ✓ |
+| Remove project | | | | | ✓ |
-#### Group
+## Group
-|Action|Guest|Reporter|Developer|Master|Owner|
-|------|-----|--------|---------|------|-----|
-|Browse group|✓|✓|✓|✓|✓|
-|Edit group|||||✓|
-|Create project in group|||||✓|
-|Manage group members|||||✓|
-|Remove group|||||✓|
+| Action | Guest | Reporter | Developer | Master | Owner |
+|-------------------------|-------|----------|-----------|--------|-------|
+| Browse group | ✓ | ✓ | ✓ | ✓ | ✓ |
+| Edit group | | | | | ✓ |
+| Create project in group | | | | ✓ | ✓ |
+| Manage group members | | | | | ✓ |
+| Remove group | | | | | ✓ |
Any user can remove himself from a group, unless he is the last Owner of the group.
diff --git a/doc/public_access/public_access.md b/doc/public_access/public_access.md
index 76d83e6f3b..493e59af22 100644
--- a/doc/public_access/public_access.md
+++ b/doc/public_access/public_access.md
@@ -1,28 +1,44 @@
+# Public access
+
Gitlab allows you to open selected projects to be accessed **publicly** or **internally**.
-Projects with either of these visibility levels will be listen in the [public access directory](/public).
+
+Projects with either of these visibility levels will be listed in the [public access directory](/public).
+
Internal projects will only be available to authenticated users.
-#### Public projects
+## Public projects
+
Public projects can be cloned **without any** authentication.
+
It will also be listed on the [public access directory](/public).
+
**Any logged in user** will have [Guest](/help/permissions) permissions on the repository.
-#### Internal projects
+## Internal projects
+
Internal projects can be cloned by any logged in user.
+
It will also be listed on the [public access directory](/public) for logged in users.
+
Any logged in user will have [Guest](/help/permissions) permissions on the repository.
-#### How to change project visibility
+## How to change project visibility
+
1. Go to your project dashboard
-2. Click on the "Edit" tab
-3. Change "Visibility Level"
+1. Click on the "Edit" tab
+1. Change "Visibility Level"
+
+## Visibility of users
-#### Visibility of users
The public page of users, located at `/u/username` is visible if either:
-* You are logged in.
-* You are logged out, and the target user is authorized to (is Guest, Reporter, etc.) at least one public project.
+- You are logged in.
+- You are logged out, and the target user is authorized to (is Guest, Reporter, etc.) at least one public project.
Otherwise, you will be redirected to the sign in page.
When visiting the public page of an user, you will only see listed projects which you can view yourself.
+
+## Restricting the use of public or internal projects
+
+In [gitlab.yml](https://gitlab.com/gitlab-org/gitlab-ce/blob/dbd88d453b8e6c78a423fa7e692004b1db6ea069/config/gitlab.yml.example#L64) you can disable public projects or public and internal projects for the entire GitLab installation to prevent people making code public by accident.
diff --git a/doc/raketasks/README.md b/doc/raketasks/README.md
index 6be24f0102..9e2f697bca 100644
--- a/doc/raketasks/README.md
+++ b/doc/raketasks/README.md
@@ -1,7 +1,6 @@
-+ [Backup restore](backup_restore.md)
-+ [Cleanup](cleanup.md)
-+ [Features](features.md)
-+ [Maintenance](maintenance.md) and self-checks
-+ [User management](user_management.md)
-+ [Web hooks](web_hooks.md)
-+ [Import](import.md) of git repositories in bulk
+- [Backup restore](backup_restore.md)
+- [Cleanup](cleanup.md)
+- [Maintenance](maintenance.md) and self-checks
+- [User management](user_management.md)
+- [Web hooks](web_hooks.md)
+- [Import](import.md) of git repositories in bulk
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index bdff6ad5da..5c1594d13d 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -1,6 +1,9 @@
-### Create a backup of the GitLab system
+# Backup restore
+
+## Create a backup of the GitLab system
Creates a backup archive of the database and all repositories. This archive will be saved in backup_path (see `config/gitlab.yml`).
+
The filename will be `[TIMESTAMP]_gitlab_backup.tar`. This timestamp can be used to restore an specific backup.
```
@@ -36,7 +39,7 @@ Deleting tmp directories...[DONE]
Deleting old backups... [SKIPPING]
```
-### Restore a previously created backup
+## Restore a previously created backup
```
bundle exec rake gitlab:backup:restore RAILS_ENV=production
@@ -79,7 +82,7 @@ Restoring repositories:
Deleting tmp directories...[DONE]
```
-### Configure cron to make daily backups
+## Configure cron to make daily backups
```
cd /home/git/gitlab
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index 99809ef434..4b3b6d71a7 100644
--- a/doc/raketasks/cleanup.md
+++ b/doc/raketasks/cleanup.md
@@ -1,4 +1,6 @@
-### Remove garbage from filesystem. Important! Data loss!
+# Cleanup
+
+## Remove garbage from filesystem. Important! Data loss!
Remove namespaces(dirs) from `/home/git/repositories` if they don't exist in GitLab database.
@@ -11,4 +13,3 @@ Remove repositories (global only for now) from `/home/git/repositories` if they
```
bundle exec rake gitlab:cleanup:repos RAILS_ENV=production
```
-
diff --git a/doc/raketasks/features.md b/doc/raketasks/features.md
index 018817d219..eaa9af5f96 100644
--- a/doc/raketasks/features.md
+++ b/doc/raketasks/features.md
@@ -1,23 +1,25 @@
-### Enable usernames and namespaces for user projects
+# Features
+
+## Enable usernames and namespaces for user projects
This command will enable the namespaces feature introduced in v4.0. It will move every project in its namespace folder.
Note:
-* Because the **repository location will change**, you will need to **update all your git url's** to point to the new location.
-* Username can be changed at [Profile / Account](/profile/account)
+- Because the **repository location will change**, you will need to **update all your git url's** to point to the new location.
+- Username can be changed at [Profile / Account](/profile/account)
**Example:**
Old path: `git@example.org:myrepo.git`
+
New path: `git@example.org:username/myrepo.git` or `git@example.org:groupname/myrepo.git`
```
bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
```
-
-### Rebuild project satellites
+## Rebuild project satellites
This command will build missing satellites for projects. After this you will be able to **merge a merge request** via GitLab and use the **online editor**.
diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md
index e11328dc5c..628bd373b8 100644
--- a/doc/raketasks/import.md
+++ b/doc/raketasks/import.md
@@ -1,3 +1,5 @@
+# Import
+
### Import bare repositories into GitLab project instance
Notes:
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 907c9352c5..30276dd762 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -1,7 +1,8 @@
-### Gather information about GitLab and the system it runs on
+# Maintenance
-This command gathers information about your GitLab installation and the System
-it runs on. These may be useful when asking for help or reporting issues.
+## Gather information about GitLab and the system it runs on
+
+This command gathers information about your GitLab installation and the System it runs on. These may be useful when asking for help or reporting issues.
```
bundle exec rake gitlab:env:info RAILS_ENV=production
@@ -14,8 +15,8 @@ System information
System: Debian 6.0.7
Current User: git
Using RVM: no
-Ruby Version: 1.9.3p392
-Gem Version: 1.8.23
+Ruby Version: 2.0.0-p481
+Gem Version: 1.8.23
Bundler Version:1.3.5
Rake Version: 10.0.4
@@ -37,15 +38,14 @@ Hooks: /home/git/gitlab-shell/hooks/
Git: /usr/bin/git
```
-
-### Check GitLab configuration
+## Check GitLab configuration
Runs the following rake tasks:
-* gitlab:env:check
-* gitlab:gitlab_shell:check
-* gitlab:sidekiq:check
-* gitlab:app:check
+- `gitlab:env:check`
+- `gitlab:gitlab_shell:check`
+- `gitlab:sidekiq:check`
+- `gitlab:app:check`
It will check that each component was setup according to the installation guide and suggest fixes for issues found.
@@ -101,10 +101,10 @@ Redis version >= 2.0.0? ... yes
Checking GitLab ... Finished
```
-
-### (Re-)Create satellite repos
+## (Re-)Create satellite repos
This will create satellite repos for all your projects.
+
If necessary, remove the `tmp/repo_satellites` directory and rerun the command below.
```
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index e823208291..81378494c6 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -1,32 +1,33 @@
-### Add user as a developer to all projects
+# User management
+
+## Add user as a developer to all projects
```bash
bundle exec rake gitlab:import:user_to_projects[username@domain.tld]
```
-
-### Add all users to all projects
+## Add all users to all projects
Notes:
-* admin users are added as masters
+- admin users are added as masters
```bash
bundle exec rake gitlab:import:all_users_to_all_projects
```
-### Add user as a developer to all groups
+## Add user as a developer to all groups
-```
+```bash
bundle exec rake gitlab:import:user_to_groups[username@domain.tld]
```
-### Add all users to all groups
+## Add all users to all groups
Notes:
-* admin users are added as owners so they can add additional users to the group
+- admin users are added as owners so they can add additional users to the group
-```
+```bash
bundle exec rake gitlab:import:all_users_to_all_groups
```
diff --git a/doc/raketasks/web_hooks.md b/doc/raketasks/web_hooks.md
index 1ca5bacb9d..704473af2d 100644
--- a/doc/raketasks/web_hooks.md
+++ b/doc/raketasks/web_hooks.md
@@ -1,31 +1,27 @@
-### Add a web hook for **ALL** projects:
+# Web hooks
+
+## Add a web hook for **ALL** projects:
RAILS_ENV=production bundle exec rake gitlab:web_hook:add URL="http://example.com/hook"
-
-### Add a web hook for projects in a given **NAMESPACE**:
+## Add a web hook for projects in a given **NAMESPACE**:
RAILS_ENV=production bundle exec rake gitlab:web_hook:add URL="http://example.com/hook" NAMESPACE=acme
-
-### Remove a web hook from **ALL** projects using:
+## Remove a web hook from **ALL** projects using:
RAILS_ENV=production bundle exec rake gitlab:web_hook:rm URL="http://example.com/hook"
-
-### Remove a web hook from projects in a given **NAMESPACE**:
+## Remove a web hook from projects in a given **NAMESPACE**:
RAILS_ENV=production bundle exec rake gitlab:web_hook:rm URL="http://example.com/hook" NAMESPACE=acme
-
-### List **ALL** web hooks:
+## List **ALL** web hooks:
RAILS_ENV=production bundle exec rake gitlab:web_hook:list
-
-### List the web hooks from projects in a given **NAMESPACE**:
+## List the web hooks from projects in a given **NAMESPACE**:
RAILS_ENV=production bundle exec rake gitlab:web_hook:list NAMESPACE=/
> Note: `/` is the global namespace.
-
diff --git a/doc/release/README.md b/doc/release/README.md
index 22510be3f1..1342b90f3b 100644
--- a/doc/release/README.md
+++ b/doc/release/README.md
@@ -1,2 +1,6 @@
-+ [Monthly](monthly.md)
-+ [Security](security.md)
+GitLab has the following updates:
+
+- [Monthly release](monthly.md), every month on the 22nd.
+- [Patch release](patch.md), if there are serious regressions.
+- [Security](security.md), for security problems.
+- [Master](master.md), update process for the master branch.
diff --git a/doc/release/master.md b/doc/release/master.md
new file mode 100644
index 0000000000..19070b46a0
--- /dev/null
+++ b/doc/release/master.md
@@ -0,0 +1,33 @@
+# How to push GitLab CE master branch to all remotes.
+
+The source code of GitLab is available on multiple servers (with GitLab.com as the canonical source).
+Synchronization between the repo's is done by the lead developer if there is no rush.
+This happens a few times per workday on average.
+If somebody else with access to all repo's wants to do it the instructions are below.
+This is just to distribute changes, not to make them.
+
+## Add this to `.bashrc` or [your dotfiles](https://github.com/dosire/dotfiles/commit/52803ce3ac60d57632164b7713ff0041e86fa26c)
+
+```bash
+gpa ()
+{
+ git push origin ${1:-master} && git push gh ${1:-master} && git push gl ${1:-master}
+}
+```
+
+## Then add remotes to your local repo
+
+```bash
+cd my-gitlab-ce-repo
+
+git remote add origin git@dev.gitlab.org:gitlab/gitlabhq.git
+git remote add gh git@github.com:gitlabhq/gitlabhq.git
+git remote add gl git@gitlab.com:gitlab-org/gitlab-ce.git
+```
+
+## Push to all remotes
+
+```bash
+gpa
+```
+
diff --git a/doc/release/monthly.md b/doc/release/monthly.md
index 514d73517b..99f2d4cafe 100644
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
@@ -1,4 +1,5 @@
# Monthly Release
+
NOTE: This is a guide for GitLab developers.
# **15th - Code Freeze & Release Manager**
@@ -9,25 +10,33 @@ NOTE: This is a guide for GitLab developers.
A release manager is selected that coordinates the entire release of this version. The release manager has to make sure all the steps below are done and delegated where necessary. This person should also make sure this document is kept up to date and issues are created and updated.
+### **3. Update Changelog**
+
+Any changes not yet added to the changelog are added by lead developer and in that merge request the complete team is asked if there is anything missing.
+
# **18th - Releasing RC1**
The RC1 release comes with the task to update the installation and upgrade docs. Be mindful that there might already be merge requests for this on GitLab or GitHub.
### **1. Create an issue for RC1 release**
+Consider naming the issue "Release x.x.x.rc1" to make it easier for later searches.
+
### **2. Update the installation guide**
1. Check if it references the correct branch `x-x-stable` (doesn't exist yet, but that is okay)
-2. Check the [GitLab Shell version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L782)
-3. Check the [Git version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L794)
-4. There might be other changes. Ask around.
+1. Check the [GitLab Shell version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L782)
+1. Check the [Git version](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/tasks/gitlab/check.rake#L794)
+1. There might be other changes. Ask around.
### **3. Create an update guide**
It's best to copy paste the previous guide and make changes where necessary. The typical steps are listed below with any points you should specifically look at.
#### 0. Any major changes?
-List any major changes here, so the user is aware of them before starting to upgrade. For instance:
+
+List any major changes here, so the user is aware of them before starting to upgrade. For instance:
+
- Database updates
- Web server changes
- File structure changes
@@ -52,42 +61,43 @@ List any major changes here, so the user is aware of them before starting to upg
Check if any of these changed since last release:
-* https://gitlab.com/gitlab-org/gitlab-ce/commits/master/lib/support/nginx/gitlab
-* https://gitlab.com/gitlab-org/gitlab-shell/commits/master/config.yml.example
-* https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/gitlab.yml.example
-* https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/unicorn.rb.example
-* https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/database.yml.mysql
-* https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/database.yml.postgresql
+-
+-
+-
+-
+-
+-
#### 8. Need to update init script?
-Check if the init.d/gitlab script changed since last release: https://gitlab.com/gitlab-org/gitlab-ce/commits/master/lib/support/init.d/gitlab
+Check if the `init.d/gitlab` script changed since last release:
#### 9. Start application
#### 10. Check application status
-### **4. Code quality indicatiors**
+### **4. Code quality indicators**
+
Make sure the code quality indicators are green / good.
-* [](http://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
+- [](http://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
-* [](https://travis-ci.org/gitlabhq/gitlabhq) on travis-ci.org (master branch)
+- [](https://travis-ci.org/gitlabhq/gitlabhq) on travis-ci.org (master branch)
-* [](https://codeclimate.com/github/gitlabhq/gitlabhq)
+- [](https://codeclimate.com/github/gitlabhq/gitlabhq)
-* [](https://gemnasium.com/gitlabhq/gitlabhq) this button can be yellow (small updates are available) but must not be red (a security fix or an important update is available)
+- [](https://gemnasium.com/gitlabhq/gitlabhq) this button can be yellow (small updates are available) but must not be red (a security fix or an important update is available)
-* [](https://coveralls.io/r/gitlabhq/gitlabhq)
+- [](https://coveralls.io/r/gitlabhq/gitlabhq)
### **5. Set VERSION**
-Set VERSION tot x.x.0.rc1
-
+Change version in VERSION to `x.x.0.rc1`.
### **6. Tag**
-Create an annotated tag that points to the version change commit.
+Create an annotated tag that points to the version change commit:
+
```
git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1'
```
@@ -98,16 +108,38 @@ Tweet about the RC release:
> GitLab x.x.x.rc1 is out. This is a release candidate intended for testing only. Please let us know if you find regressions.
-### **8. Update Cloud**
+n
+### **8. Update GitLab.com**
-Merge the RC1 code into Cloud. Once the build is green, deploy in the morning.
+Merge the RC1 code into GitLab.com. Once the build is green, deploy in the morning.
It is important to do this as soon as possible, so we can catch any errors before we release the full version.
+# **21st - Preparation **
+
+### **1. Prepare the blog post**
+
+- Check the changelog of CE and EE for important changes. Based on [release blog template](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/doc/release_blog_template.md) fill in the important information.
+- Create a WIP MR for the blog post and cc the team so everyone can give feedback.
+- Ask Dmitriy to add screenshots to the WIP MR.
+- Decide with team who will be the MVP user.
+- Add a note if there are security fixes: This release fixes an important security issue and we advise everyone to upgrade as soon as possible.
+
+### **2. Q&A**
+
+Create issue on dev.gitlab.org `gitlab` repository, named "GitLab X.X release" in order to keep track of the progress.
+
+Use the omnibus packages of Enterprise Edition using [this guide](https://dev.gitlab.org/gitlab/gitlab-ee/blob/master/doc/release/manual_testing.md).
+
+**NOTE** Upgrader can only be tested when tags are pushed to all repositories. Do not forget to confirm it is working before releasing. Note that in the issue.
+
+### **3. Fix anything coming out of the QA**
+
+Create an issue with description of a problem, if it is quick fix fix yourself otherwise contact the team for advice.
# **22nd - Release CE and EE**
-For GitLab EE, append -ee to the branches and tags.
+For GitLab EE, append `-ee` to the branches and tags.
`x-x-stable-ee`
@@ -123,45 +155,80 @@ git push x-x-stable
```
### **2. Build the Omnibus packages**
+
[Follow this guide](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md)
-### **3. QA**
-Use the omnibus packages to test using [this guide](https://dev.gitlab.org/gitlab/gitlab-ee/blob/master/doc/release/manual_testing.md)
+### **3. Set VERSION to x.x.x and push**
+Change the GITLAB_SHELL_VERSION file in `master` of the CE repository if the version changed.
-### **4. Fix anything coming out of the QA**
+Change the GITLAB_SHELL_VERSION file in `master` of the EE repository if the version changed.
-### **5. Set VERSION to x.x.0**
+Change the VERSION file in `master` branch of the CE repository and commit. Cherry-pick into the `x-x-stable` branch of CE.
+
+Change the VERSION file in `master` branch of the EE repository and commit. Cherry-pick into the `x-x-stable-ee` branch of EE.
+
+### **4. Create annotated tag vx.x.x**
+
+In `x-x-stable` branch check for the SHA-1 of the commit with VERSION file changed. Tag that commit,
-### **6. Create annotated tag vx.x.0**
```
-git tag -a vx.x.0 -m 'Version x.x.0'
+git tag -a vx.x.0 -m 'Version x.x.0' xxxxx
```
-### **7. Push VERSION + Tag to master, merge into x-x-stable**
+where `xxxxx` is SHA-1.
+
+### **5. Push the tag**
+
```
-git push origin master
+git push origin vx.x.0
```
-Next, merge the VERSION into the x-x-stable branch.
-
-### **8. Push to remotes**
+### **6. Push to remotes**
For GitLab CE, push to dev, GitLab.com and GitHub.
For GitLab EE, push to the subscribers repo.
+Make sure the branch is marked 'protected' on each of the remotes you pushed to.
+
NOTE: You might not have the rights to push to master on dev. Ask Dmitriy.
-### **9. Publish blog for new release**
-* Mention what GitLab is on the second line: GitLab is open source software to collaborate on code.
-* Select and thank the the Most Valuable Person (MVP) of this release.
-* Add a note if there are security fixes: This release fixes an important security issue and we advise everyone to upgrade as soon as possible.
+### **7. Publish blog for new release**
-### **10. Tweet to blog**
+Merge the [blog merge request](#1-prepare-the-blog-post) in `www-gitlab-com` repository.
+
+### **8. Tweet to blog**
Send out a tweet to share the good news with the world. List the features in short and link to the blog post.
+Proposed tweet for CE "GitLab X.X.X CE is released! It brings *** "
+
+Proposed tweet for EE "GitLab X.X.X EE is released! It brings *** "
+
+### **9. Send out newsletter**
+
+In MailChimp replicate the former release newsletters to customers / newsletter subscribers (these are two separate things) and modify them accordingly.
+
+Include a link to the blog post and keep it short.
+
+Proposed email for CE: "We have released a new version of GitLab Community Edition and its packages. See our blog post(, also see the [disclosure section on the GitLab.com website](http://www.gitlab.com/disclosure/). Please do NOT create publicly viewable issues for suspected security vulnerabilities.
## Release Procedure
-1. Verify that the issue can be repoduced
+1. Verify that the issue can be reproduced
1. Acknowledge the issue to the researcher that disclosed it
1. Do the steps from [patch release document](doc/release/patch.md), starting with "Create an issue on private GitLab development server"
1. Create feature branches for the blog post on GitLab.com and link them from the code branch
1. Merge and publish the blog posts
-1. Send tweets about the release from @gitlabhq
+1. Send tweets about the release from `@gitlabhq`
1. Send out an email to the subscribers mailing list on MailChimp
1. Send out an email to [the community google mailing list](https://groups.google.com/forum/#!forum/gitlabhq)
1. Send out an email to [the GitLab newsletter list](http://gitlab.us5.list-manage.com/subscribe?u=498dccd07cf3e9482bee33ba4&id=98a9a4992c)
1. Post a signed copy of our complete announcement to [oss-security](http://www.openwall.com/lists/oss-security/) and request a CVE number
1. Add the security researcher to the [Security Researcher Acknowledgments list](http://www.gitlab.com/vulnerability-acknowledgements/)
1. Thank the security researcher in an email for their cooperation
-1. Update the blogpost and the CHANGELOG when we receive the CVE number
+1. Update the blog post and the CHANGELOG when we receive the CVE number
The timing of the code merge into master should be coordinated in advance.
+
After the merge we strive to publish the announcements within 60 minutes.
## Blog post template
XXX Security Advisory for GitLab
-A recently discovered critical vulnerability in GitLab allows [unauthenticated API access|remote code execution|unauthorized access to repositories|XXX|PICKSOMETHING]. All users should update GitLab and gitlab-shell immediately.
-We [have|haven't|XXX|PICKSOMETHING|] heard of this vulnerability being actively exploited.
+A recently discovered critical vulnerability in GitLab allows [unauthenticated API access|remote code execution|unauthorized access to repositories|XXX|PICKSOMETHING]. All users should update GitLab and gitlab-shell immediately. We [have|haven't|XXX|PICKSOMETHING|] heard of this vulnerability being actively exploited.
### Version affected
GitLab Community Edition XXX and lower
+
GitLab Enterprise Edition XXX and lower
### Fixed versions
GitLab Community Edition XXX and up
+
GitLab Enterprise Edition XXX and up
### Impact
diff --git a/doc/security/README.md b/doc/security/README.md
index f8dd1291b9..b89e8cbe02 100644
--- a/doc/security/README.md
+++ b/doc/security/README.md
@@ -1,2 +1,4 @@
-+ [Password length limits](password_length_limits.md)
-+ [Rack attack](rack_attack.md)
+# Security
+
+- [Password length limits](password_length_limits.md)
+- [Rack attack](rack_attack.md)
diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md
index c8d66e9636..d21b26a43e 100644
--- a/doc/security/password_length_limits.md
+++ b/doc/security/password_length_limits.md
@@ -1,6 +1,7 @@
# Custom password length limits
If you want to enforce longer user passwords you can create an extra Devise initializer with the steps below.
+
If you do not use the `devise_password_length.rb` initializer the password length is set to a minimum of 8 characters in `config/initializers/devise.rb`.
```bash
diff --git a/doc/security/rack_attack.md b/doc/security/rack_attack.md
index a0d02b1650..92066997be 100644
--- a/doc/security/rack_attack.md
+++ b/doc/security/rack_attack.md
@@ -1,19 +1,25 @@
+# Rack attack
+
To prevent abusive clients doing damage GitLab uses rack-attack gem.
+
If you installed or upgraded GitLab by following the official guides this should be enabled by default.
+
If you are missing `config/initializers/rack_attack.rb` the following steps need to be taken in order to enable protection for your GitLab instance:
-1. In config/application.rb find and uncomment the following line:
- config.middleware.use Rack::Attack
-2. Rename config/initializers/rack_attack.rb.example to config/initializers/rack_attack.rb
-3. Review the paths_to_be_protected and add any other path you need protecting
-4. Restart GitLab instance
+1. In config/application.rb find and uncomment the following line:
-By default, user sign-in, user sign-up(if enabled) and user password reset is limited to 6 requests per minute.
-After trying for 6 times, client will have to wait for the next minute to be able to try again.
-These settings can be found in `config/initializers/rack_attack.rb`
+ config.middleware.use Rack::Attack
+
+1. Rename `config/initializers/rack_attack.rb.example` to `config/initializers/rack_attack.rb`.
+
+1. Review the `paths_to_be_protected` and add any other path you need protecting.
+
+1. Restart GitLab instance.
+
+By default, user sign-in, user sign-up(if enabled) and user password reset is limited to 6 requests per minute. After trying for 6 times, client will have to wait for the next minute to be able to try again. These settings can be found in `config/initializers/rack_attack.rb`
If you want more restrictive/relaxed throttle rule change the `limit` or `period` values. For example, more relaxed throttle rule will be if you set limit: 3 and period: 1.second(this will allow 3 requests per second). You can also add other paths to the protected list by adding to `paths_to_be_protected` variable. If you change any of these settings do not forget to restart your GitLab instance.
In case you find throttling is not enough to protect you against abusive clients, rack-attack gem offers IP whitelisting, blacklisting, Fail2ban style filter and tracking.
-For more information on how to use these options check out [rack-attack README](https://github.com/kickstarter/rack-attack/blob/master/README.md).
\ No newline at end of file
+For more information on how to use these options check out [rack-attack README](https://github.com/kickstarter/rack-attack/blob/master/README.md).
diff --git a/doc/ssh/README.md b/doc/ssh/README.md
index 76d9e8bb07..c87fffd7d2 100644
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
@@ -1,2 +1,4 @@
-+ [Deploy keys](deploy_keys.md)
-+ [SSH](ssh.md)
+# SSH
+
+- [Deploy keys](deploy_keys.md)
+- [SSH](ssh.md)
diff --git a/doc/ssh/deploy_keys.md b/doc/ssh/deploy_keys.md
index c7125b7949..dcca8bdc61 100644
--- a/doc/ssh/deploy_keys.md
+++ b/doc/ssh/deploy_keys.md
@@ -1,12 +1,9 @@
+# Deploy keys
+
Deploy keys allow read-only access one or multiple projects with a single SSH key.
-This is really useful for cloning repositories to your Continuous Integration (CI) server.
-By using a deploy keys you don't have to setup a dummy user account.
+This is really useful for cloning repositories to your Continuous Integration (CI) server. By using a deploy keys you don't have to setup a dummy user account.
-If you are a project master or owner you can add a deploy key in the project settings under the section Deploy Keys.
-Press the 'New Deploy Key' button and upload a public ssh key.
-After this the machine that uses the corresponding private key has read-only access to the project.
+If you are a project master or owner you can add a deploy key in the project settings under the section Deploy Keys. Press the 'New Deploy Key' button and upload a public ssh key. After this the machine that uses the corresponding private key has read-only access to the project.
-You can't add the same deploy key twice with the 'New Deploy Key' option.
-If you want to add the same key to another project please enable it in the list that says 'Deploy keys from projects available to you'.
-All the deploy keys of all the projects you have access to are available. This project access can happen through being a direct member of the project or through a group. See `def accessible_deploy_keys` in `app/models/user.rb` for more information.
+You can't add the same deploy key twice with the 'New Deploy Key' option. If you want to add the same key to another project please enable it in the list that says 'Deploy keys from projects available to you'. All the deploy keys of all the projects you have access to are available. This project access can happen through being a direct member of the project or through a group. See `def accessible_deploy_keys` in `app/models/user.rb` for more information.
diff --git a/doc/ssh/ssh.md b/doc/ssh/ssh.md
index 0a38bc16b4..d466c1bde7 100644
--- a/doc/ssh/ssh.md
+++ b/doc/ssh/ssh.md
@@ -1,12 +1,10 @@
+# SSH keys
+
SSH key allows you to establish a secure connection between your computer and GitLab
+Before generating an SSH key, check if your system already has one by running `cat ~/.ssh/id_rsa.pub` If your see a long string starting with `ssh-rsa` or `ssh-dsa`, you can skip the ssh-keygen step.
-Before generating an SSH key, check if your system already has one by running `cat ~/.ssh/id_rsa.pub`
-If your see a long string starting with `ssh-rsa` or `ssh-dsa`, you can skip the ssh-keygen step.
-
-
-To generate a new SSH key just open your terminal and use code below. The ssh-keygen command prompts you for a location and filename to store the key pair and for a password.
-When prompted for the location and filename you can press enter to use the default.
+To generate a new SSH key just open your terminal and use code below. The ssh-keygen command prompts you for a location and filename to store the key pair and for a password. When prompted for the location and filename you can press enter to use the default.
It is a best practice to use a password for an SSH key but it is not required and you can skip creating a password by pressing enter.
Note that the password you choose here can't be altered or retrieved.
@@ -20,5 +18,4 @@ Use the code below to show your public key.
cat ~/.ssh/id_rsa.pub
```
-Copy-paste the key to the 'My SSH Keys' section under the 'SSH' tab in your user profile.
-Please copy the complete key starting with `ssh-` and ending with your username and host.
+Copy-paste the key to the 'My SSH Keys' section under the 'SSH' tab in your user profile. Please copy the complete key starting with `ssh-` and ending with your username and host.
diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md
index 5c8daf466a..47f17c1a08 100644
--- a/doc/system_hooks/system_hooks.md
+++ b/doc/system_hooks/system_hooks.md
@@ -1,8 +1,10 @@
+# System hooks
+
Your GitLab instance can perform HTTP POST requests on the following events: `create_project`, `delete_project`, `create_user`, `delete_user` and `change_team_member`.
System hooks can be used, e.g. for logging or changing information in a LDAP server.
-#### Hooks request example:
+## Hooks request example
**Project created:**
@@ -71,23 +73,23 @@ System hooks can be used, e.g. for logging or changing information in a LDAP ser
**User created:**
```json
-{
+{
"created_at": "2012-07-21T07:44:07Z",
"email": "js@gitlabhq.com",
"event_name": "user_create",
- "name": "John Smith",
- "user_id": 41
+ "name": "John Smith",
+ "user_id": 41
}
```
**User removed:**
```json
-{
+{
"created_at": "2012-07-21T07:44:07Z",
"email": "js@gitlabhq.com",
"event_name": "user_destroy",
"name": "John Smith",
- "user_id": 41
+ "user_id": 41
}
```
diff --git a/doc/update/2.6-to-3.0.md b/doc/update/2.6-to-3.0.md
index d7047d8eb1..6aabbe095d 100644
--- a/doc/update/2.6-to-3.0.md
+++ b/doc/update/2.6-to-3.0.md
@@ -1,10 +1,10 @@
# From 2.6 to 3.0
-### 1. Stop server & resque
+## 1. Stop server & resque
sudo service gitlab stop
-### 2. Update code & db
+## 2. Update code & db
```bash
@@ -54,10 +54,8 @@ sudo -u git -H sed -i "s/\(GIT_CONFIG_KEYS\s*=>*\s*\).\{2\}/\\1'\.\*'/g" /home/g
# Check app status
sudo -u gitlab bundle exec rake gitlab:app:status RAILS_ENV=production
-
```
-
-### 3. Start all
+## 3. Start all
sudo service gitlab start
diff --git a/doc/update/2.9-to-3.0.md b/doc/update/2.9-to-3.0.md
index af929e027a..8af86b0dc9 100644
--- a/doc/update/2.9-to-3.0.md
+++ b/doc/update/2.9-to-3.0.md
@@ -1,10 +1,10 @@
# From 2.9 to 3.0
-### 1. Stop server & resque
+## 1. Stop server & resque
sudo service gitlab stop
-### 2. Follow instructions
+## 2. Follow instructions
```bash
@@ -31,7 +31,6 @@ sudo -u git -H sed -i 's/\(GL_GITCONFIG_KEYS\s*=>*\s*\).\{2\}/\\1"\.\*"/g' /home
sudo -u gitlab -H bundle exec rake gitlab:app:status RAILS_ENV=production
```
-
-### 3. Start all
+## 3. Start all
sudo service gitlab start
diff --git a/doc/update/3.0-to-3.1.md b/doc/update/3.0-to-3.1.md
index 5f06f818d1..3206df3499 100644
--- a/doc/update/3.0-to-3.1.md
+++ b/doc/update/3.0-to-3.1.md
@@ -1,26 +1,22 @@
# From 3.0 to 3.1
-__IMPORTANT!__
+**IMPORTANT!**
-In this release __we moved Resque jobs under own gitlab namespace__.
+In this release **we moved Resque jobs under own gitlab namespace**
-Despite a lot of advantages it requires from our users to __replace gitolite post-receive hook with new one__.
+Despite a lot of advantages it requires from our users to **replace gitolite post-receive hook with new one**.
-Most of projects has post-receive file as symlink to gitolite `/home/git/.gitolite/hooks/post-receive`.
-But some of them may have a real file. In this case you should rewrite it with symlink to gitolite hook.
+Most of projects has post-receive file as symlink to gitolite `/home/git/.gitolite/hooks/post-receive`. But some of them may have a real file. In this case you should rewrite it with symlink to gitolite hook.
I wrote a bash script which will do it automatically for you. Just make sure all path inside is valid for you
-- - -
-
-### 1. Stop server & resque
+## 1. Stop server & resque
sudo service gitlab stop
-### 2. Update GitLab
+## 2. Update GitLab
```bash
-
# Get latest code
sudo -u gitlab -H git fetch
sudo -u gitlab -H git checkout v3.1.0
@@ -35,12 +31,11 @@ sudo -u gitlab -H bundle install --without development test postgres sqlite
# Migrate db
sudo -u gitlab -H bundle exec rake db:migrate RAILS_ENV=production
-
```
-### 3. Update post-receive hooks
+## 3. Update post-receive hooks
-#### Gitolite 3
+### Gitolite 3
Step 1: Rewrite post-receive hook
@@ -60,7 +55,7 @@ sudo -u gitlab -H vim lib/support/rewrite-hooks.sh
sudo -u git -H lib/support/rewrite-hooks.sh
```
-#### Gitolite v2
+### Gitolite v2
Step 1: rewrite post-receive hook for gitolite 2
@@ -71,7 +66,6 @@ sudo chown git:git /home/git/share/gitolite/hooks/common/post-receive
Step 2: Replace symlinks in project to valid place
-
#!/bin/bash
src="/home/git/repositories"
for dir in `ls "$src/"`
@@ -90,19 +84,13 @@ Step 2: Replace symlinks in project to valid place
fi
done
-
-### 4. Check app status
+## 4. Check app status
```bash
-
# Check APP Status
sudo -u gitlab -H bundle exec rake gitlab:app:status RAILS_ENV=production
-
-
-
```
-
-### 5. Start all
+## 5. Start all
sudo service gitlab start
diff --git a/doc/update/3.1-to-4.0.md b/doc/update/3.1-to-4.0.md
index c5ae3a40a7..165f4e6a30 100644
--- a/doc/update/3.1-to-4.0.md
+++ b/doc/update/3.1-to-4.0.md
@@ -2,25 +2,22 @@
## Important changes
-* Support for SQLite was dropped
-* Support for gitolite 2 was dropped
-* Projects are organized in namespaces
-* The GitLab post-receive hook needs to be updated
-* The configuration file needs to be updated
-* Availability of `python2` executable
+- Support for SQLite was dropped
+- Support for Gitolite 2 was dropped
+- Projects are organized in namespaces
+- The GitLab post-receive hook needs to be updated
+- The configuration file needs to be updated
+- Availability of `python2` executable
-Most of projects has post-receive file as symlink to gitolite `/home/git/.gitolite/hooks/post-receive`.
-But some of them may have a real file. In this case you should rewrite it with symlink to gitolite hook.
+Most of projects has post-receive file as symlink to Gitolite `/home/git/.gitolite/hooks/post-receive`. But some of them may have a real file. In this case you should rewrite it with symlink to Gitolite hook.
I wrote a bash script which will do it automatically for you. Just make sure all path inside is valid for you
-- - -
-
-### 1. Stop GitLab & Resque
+## 1. Stop GitLab & Resque
sudo service gitlab stop
-### 2. Update GitLab
+## 2. Update GitLab
```bash
@@ -43,8 +40,7 @@ sudo -u gitlab -H bundle exec rake gitlab:enable_namespaces RAILS_ENV=production
```
-### 3. Update post-receive hooks (Requires gitolite v3 )
-
+## 3. Update post-receive hooks (Requires Gitolite v3 )
Step 1: Rewrite post-receive hook
@@ -63,9 +59,7 @@ sudo -u gitlab -H vim lib/support/rewrite-hooks.sh
sudo -u git -H lib/support/rewrite-hooks.sh
```
-
-### 4. Replace config with new one
-
+## 4. Replace config with new one
# backup old one
sudo -u gitlab -H cp config/gitlab.yml config/gitlab.yml.old
@@ -76,9 +70,7 @@ sudo -u git -H lib/support/rewrite-hooks.sh
# edit it
sudo -u gitlab -H vim config/gitlab.yml
-
-### 5. Disable ssh known_host check for own domain
-
+## 5. Disable ssh known_host check for own domain
echo "Host localhost
StrictHostKeyChecking no
@@ -88,12 +80,10 @@ sudo -u git -H lib/support/rewrite-hooks.sh
StrictHostKeyChecking no
UserKnownHostsFile=/dev/null" | sudo tee -a /etc/ssh/ssh_config
-
-### 6. Check GitLab's status
+## 6. Check GitLab's status
sudo -u gitlab -H bundle exec rake gitlab:check RAILS_ENV=production
-
-### 7. Start GitLab & Resque
+## 7. Start GitLab & Resque
sudo service gitlab start
diff --git a/doc/update/4.0-to-4.1.md b/doc/update/4.0-to-4.1.md
index 324af7597b..d5e5d62fb1 100644
--- a/doc/update/4.0-to-4.1.md
+++ b/doc/update/4.0-to-4.1.md
@@ -2,18 +2,16 @@
## Important changes
-* Resque replaced with Sidekiq
-* New options for configuration file added
-* Init.d script should be updated
-* __requires ruby1.9.3-p327__
+- Resque replaced with Sidekiq
+- New options for configuration file added
+- Init.d script should be updated
+- **requires ruby1.9.3-p327**
-- - -
-
-### 1. Stop GitLab & Resque
+## 1. Stop GitLab & Resque
sudo service gitlab stop
-### 2. Update GitLab
+## 2. Update GitLab
```bash
# Set the working directory
@@ -31,7 +29,7 @@ sudo -u gitlab -H bundle exec rake db:migrate RAILS_ENV=production
```
-### 3. Replace init.d script with a new one
+## 3. Replace init.d script with a new one
```
# backup old one
@@ -43,15 +41,15 @@ sudo chmod +x /etc/init.d/gitlab
```
-### 4. Check GitLab's status
+## 4. Check GitLab's status
sudo -u gitlab -H bundle exec rake gitlab:check RAILS_ENV=production
-### 5. Start GitLab & Sidekiq
+## 5. Start GitLab & Sidekiq
sudo service gitlab start
-### 6. Remove old init.d script
+## 6. Remove old init.d script
sudo rm /etc/init.d/gitlab.old
diff --git a/doc/update/4.1-to-4.2.md b/doc/update/4.1-to-4.2.md
index 3aaf17b772..5ee8e8781e 100644
--- a/doc/update/4.1-to-4.2.md
+++ b/doc/update/4.1-to-4.2.md
@@ -1,10 +1,10 @@
# From 4.1 to 4.2
-### 1. Stop server & resque
+## 1. Stop server & Resque
sudo service gitlab stop
-### 2. Update code & db
+## 2. Update code & DB
```bash
@@ -24,15 +24,12 @@ sudo -u gitlab -H bundle exec rake db:migrate RAILS_ENV=production
```
-
-### 3. Check GitLab's status
+## 3. Check GitLab's status
```bash
sudo -u gitlab -H bundle exec rake gitlab:check RAILS_ENV=production
```
-
-
-### 4. Start all
+## 4. Start all
sudo service gitlab start
diff --git a/doc/update/4.2-to-5.0.md b/doc/update/4.2-to-5.0.md
index f8fb607e01..230c1e88b2 100644
--- a/doc/update/4.2-to-5.0.md
+++ b/doc/update/4.2-to-5.0.md
@@ -1,32 +1,32 @@
# From 4.2 to 5.0
## Warning
+
GitLab 5.0 is affected by critical security vulnerability CVE-2013-4490.
## Important changes
-* We don't use `gitlab` user any more. Everything will be moved to `git` user
-* __requires ruby1.9.3__
+- We don't use `gitlab` user any more. Everything will be moved to `git` user
+- **requires ruby1.9.3**
-
-__0. Stop gitlab__
+## 0. Stop gitlab
sudo service gitlab stop
-__1. add bash to git user__
+## 1. add bash to git user
```
sudo chsh -s /bin/bash git
```
-__2. git clone gitlab-shell__
+## 2. git clone gitlab-shell
```
cd /home/git/
sudo -u git -H git clone https://github.com/gitlabhq/gitlab-shell.git /home/git/gitlab-shell
```
-__3. setup gitlab-shell__
+## 3. setup gitlab-shell
```bash
# chmod all repos and files under git
@@ -55,7 +55,7 @@ ruby -v
exit
```
-__4. Copy gitlab instance to git user__
+## 4. Copy gitlab instance to git user
```bash
sudo cp -R /home/gitlab/gitlab /home/git/gitlab
@@ -66,7 +66,7 @@ sudo rm -rf /home/gitlab/gitlab-satellites
sudo rm /tmp/gitlab.socket
```
-__5. Update gitlab to recent version__
+## 5. Update gitlab to recent version
```bash
cd /home/git/gitlab
@@ -110,7 +110,7 @@ sudo chmod -R u+rwX /home/git/gitlab/tmp/pids
```
-__6. Update init.d script and nginx config__
+## 6. Update init.d script and nginx config
```bash
# init.d
@@ -127,14 +127,11 @@ sudo -u git -H cp /home/git/gitlab/config/unicorn.rb.example /home/git/gitlab/co
sudo vim /etc/nginx/sites-enabled/gitlab
sudo service nginx restart
-
```
-__7. Start gitlab instance__
+## 7. Start GitLab instance
```
-
-
sudo service gitlab start
# check if unicorn and sidekiq started
@@ -145,7 +142,7 @@ ps aux | grep sidekiq
```
-__8. Check installation__
+## 8. Check installation
```bash
@@ -164,5 +161,4 @@ sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
```
-
-__P.S. If everything works as expected you can remove gitlab user from system__
+**P.S. If everything works as expected you can remove gitlab user from system**
diff --git a/doc/update/5.0-to-5.1.md b/doc/update/5.0-to-5.1.md
index ba56507dd8..628d8bc7df 100644
--- a/doc/update/5.0-to-5.1.md
+++ b/doc/update/5.0-to-5.1.md
@@ -1,18 +1,19 @@
# From 5.0 to 5.1
## Warning
+
GitLab 5.1 is affected by critical security vulnerability CVE-2013-4490.
-## Release notes:
+## Release notes
-* `unicorn` replaced with `puma`
-* merge request cached diff will be truncated
+- `unicorn` replaced with `puma`
+- merge request cached diff will be truncated
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -20,7 +21,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 5-1-stable
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -33,8 +34,7 @@ sudo -u git -H cp config.yml.example config.yml
sudo -u git -H vi config.yml
```
-
-### 4. Install libs, migrations etc
+## 4. Install libs, migrations etc
```bash
cd /home/git/gitlab
@@ -47,7 +47,7 @@ sudo -u git -H bundle exec rake migrate_merge_requests RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 5. Update init.d script with a new one
+## 5. Update init.d script with a new one
```bash
# init.d
@@ -56,9 +56,9 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlab-rec
sudo chmod +x /etc/init.d/gitlab
```
-### 6. Mysql grant privileges
+## 6. MySQL grant privileges
-Only if you are using mysql:
+Only if you are using MySQL:
```bash
mysql -u root -p
@@ -66,6 +66,6 @@ mysql> GRANT LOCK TABLES ON `gitlabhq_production`.* TO 'gitlab'@'localhost';
mysql> \q
```
-### 7. Start application
+## 7. Start application
sudo service gitlab start
diff --git a/doc/update/5.1-to-5.2.md b/doc/update/5.1-to-5.2.md
index 466c815195..c37f20ce55 100644
--- a/doc/update/5.1-to-5.2.md
+++ b/doc/update/5.1-to-5.2.md
@@ -1,9 +1,10 @@
# From 5.1 to 5.2
## Warning
+
GitLab 5.2 is affected by critical security vulnerabilities CVE-2013-4490 and CVE-2013-4489.
-### 0. Backup
+## 0. Backup
It's useful to make a backup just in case things go south:
(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
@@ -13,11 +14,11 @@ cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -25,7 +26,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 5-2-stable
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -33,7 +34,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.4.0
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -49,12 +50,12 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 5. Update config files
+## 5. Update config files
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-2-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-2-stable/config/puma.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-2-stable/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-2-stable/config/puma.rb.example but with your settings.
-### 6. Update Init script
+## 6. Update Init script
```bash
cd /home/git/gitlab
@@ -63,7 +64,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 7. Create uploads directory
+## 7. Create uploads directory
```bash
cd /home/git/gitlab
@@ -71,12 +72,12 @@ sudo -u git -H mkdir public/uploads
sudo chmod -R u+rwX public/uploads
```
-### 8. Start application
+## 8. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+## 9. Check application status
Check if GitLab and its environment are configured correctly:
@@ -91,10 +92,10 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (5.1)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.0 to 5.1`](5.0-to-5.1.md), except for the database migration
-(The backup is already migrated to the previous version)
-### 2. Restore from the backup:
+Follow the [`upgrade guide from 5.0 to 5.1`](5.0-to-5.1.md), except for the database migration (the backup is already migrated to the previous version).
+
+### 2. Restore from the backup
```bash
cd /home/git/gitlab
diff --git a/doc/update/5.1-to-5.4.md b/doc/update/5.1-to-5.4.md
index 56f4854daf..53dbfd00ad 100644
--- a/doc/update/5.1-to-5.4.md
+++ b/doc/update/5.1-to-5.4.md
@@ -1,21 +1,21 @@
# From 5.1 to 5.4
+
Also works starting from 5.2.
-### 0. Backup
+## 0. Backup
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+It's useful to make a backup just in case things go south (with MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version):
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -23,7 +23,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 5-4-stable # Latest version of 5-4-stable addresses CVE-2013-4489
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -31,7 +31,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulnerabilities
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -47,12 +47,12 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 5. Update config files
+## 5. Update config files
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/puma.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/puma.rb.example but with your settings.
-### 6. Update Init script
+## 6. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -60,7 +60,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 7. Create uploads directory
+## 7. Create uploads directory
```bash
cd /home/git/gitlab
@@ -68,13 +68,12 @@ sudo -u git -H mkdir public/uploads
sudo chmod -R u+rwX public/uploads
```
-
-### 8. Start application
+## 8. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+## 9. Check application status
Check if GitLab and its environment are configured correctly:
@@ -89,8 +88,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (5.3)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.2 to 5.3`](5.2-to-5.3.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 5.2 to 5.3`](5.2-to-5.3.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
diff --git a/doc/update/5.1-to-6.0.md b/doc/update/5.1-to-6.0.md
index 5b74b1f893..11afc75f0f 100644
--- a/doc/update/5.1-to-6.0.md
+++ b/doc/update/5.1-to-6.0.md
@@ -1,26 +1,34 @@
# From 5.1 to 6.0
## Warning
+
GitLab 6.0 is affected by critical security vulnerabilities CVE-2013-4490 and CVE-2013-4489.
-### Deprecations
+## Deprecations
-#### Global projects
+### Global projects
The root (global) namespace for projects is deprecated.
-So you need to move all your global projects under groups or users manually before update or they will be automatically moved to the project owner namespace during the update. When a project is moved all its members will receive an email with instructions how to update their git remote url. Please make sure you disable sending email when you do a test of the upgrade.
-#### Teams
+So you need to move all your global projects under groups or users manually before update or they will be automatically moved to the project owner namespace during the update. When a project is moved all its members will receive an email with instructions how to update their git remote URL. Please make sure you disable sending email when you do a test of the upgrade.
+
+### Teams
We introduce group membership in 6.0 as a replacement for teams.
+
The old combination of groups and teams was confusing for a lot of people.
+
And when the members of a team where changed this wasn't reflected in the project permissions.
+
In GitLab 6.0 you will be able to add members to a group with a permission level for each member.
+
These group members will have access to the projects in that group.
+
Any changes to group members will immediately be reflected in the project permissions.
+
You can even have multiple owners for a group, greatly simplifying administration.
-### 0. Backup
+## 0. Backup
It's useful to make a backup just in case things go south:
(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
@@ -30,11 +38,11 @@ cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -42,7 +50,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 6-0-stable
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -50,14 +58,14 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9
```
-### 4. Install additional packages
+## 4. Install additional packages
```bash
# For reStructuredText markup language support install required package:
sudo apt-get install python-docutils
```
-### 5. Install libs, migrations, etc.
+## 5. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -83,14 +91,14 @@ sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 6. Update config files
+## 6. Update config files
Note: We switched from Puma in GitLab 5.x to unicorn in GitLab 6.0.
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/unicorn.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/masterconfig/unicorn.rb.example but with your settings.
-### 7. Update Init script
+## 7. Update Init script
```bash
cd /home/git/gitlab
@@ -99,7 +107,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 8. Create uploads directory
+## 8. Create uploads directory
```bash
cd /home/git/gitlab
@@ -107,12 +115,12 @@ sudo -u git -H mkdir -p public/uploads
sudo chmod -R u+rwX public/uploads
```
-### 9. Start application
+## 9. Start application
sudo service gitlab start
sudo service nginx restart
-### 10. Check application status
+## 10. Check application status
Check if GitLab and its environment are configured correctly:
@@ -127,8 +135,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (5.1)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.0 to 5.1`](5.0-to-5.1.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 5.0 to 5.1`](5.0-to-5.1.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
@@ -137,20 +145,24 @@ cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
-### Troubleshooting
+## Troubleshooting
+
The migrations in this update are very sensitive to incomplete or inconsistent data. If you have a long-running GitLab installation and some of the previous upgrades did not work out 100% correct this may bite you now. The following commands can be run in the rails console to look for 'bad' data.
-All project owners should have an owner
+All project owners should have an owner:
+
```
Project.all.select { |project| project.owner.blank? }
```
-Every user should have a namespace
+Every user should have a namespace:
+
```
User.all.select { |u| u.namespace.blank? }
```
-Projects in the global namespace should not conflict with projects in the owner namespace
+Projects in the global namespace should not conflict with projects in the owner namespace:
+
```
Project.where(namespace_id: nil).select { |p| Project.where(path: p.path, namespace_id: p.owner.try(:namespace).try(:id)).present? }
```
diff --git a/doc/update/5.2-to-5.3.md b/doc/update/5.2-to-5.3.md
index e3c3016db6..e39e18d421 100644
--- a/doc/update/5.2-to-5.3.md
+++ b/doc/update/5.2-to-5.3.md
@@ -1,23 +1,23 @@
# From 5.2 to 5.3
## Warning
+
GitLab 5.3 is affected by critical security vulnerabilities CVE-2013-4490 and CVE-2013-4489.
-### 0. Backup
+## 0. Backup
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+It's useful to make a backup just in case things go south (with MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version):
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -25,7 +25,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 5-3-stable
```
-### 3. Install libs, migrations, etc.
+## 3. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -41,12 +41,12 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 4. Update config files
+## 4. Update config files
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-3-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-3-stable/config/puma.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-3-stable/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-3-stable/config/puma.rb.example but with your settings.
-### 5. Update Init script
+## 5. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -54,12 +54,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5
sudo chmod +x /etc/init.d/gitlab
```
-### 6. Start application
+## 6. Start application
sudo service gitlab start
sudo service nginx restart
-### 7. Check application status
+## 7. Check application status
Check if GitLab and its environment are configured correctly:
@@ -74,8 +74,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (5.2)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.1 to 5.2`](5.1-to-5.2.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 5.1 to 5.2`](5.1-to-5.2.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
diff --git a/doc/update/5.3-to-5.4.md b/doc/update/5.3-to-5.4.md
index 213ce77ec3..e1749f133b 100644
--- a/doc/update/5.3-to-5.4.md
+++ b/doc/update/5.3-to-5.4.md
@@ -1,20 +1,19 @@
# From 5.3 to 5.4
-### 0. Backup
+## 0. Backup
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+It's useful to make a backup just in case things go south (with MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version):
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -22,7 +21,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 5-4-stable # Latest version of 5-4-stable addresses CVE-2013-4489
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -30,7 +29,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulnerabilities
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -46,12 +45,12 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 5. Update config files
+## 5. Update config files
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/puma.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/puma.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/5-4-stable/config/puma.rb.example but with your settings.
-### 6. Update Init script
+## 6. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -59,12 +58,12 @@ sudo curl --output /etc/init.d/gitlab https://raw.github.com/gitlabhq/gitlabhq/5
sudo chmod +x /etc/init.d/gitlab
```
-### 7. Start application
+## 7. Start application
sudo service gitlab start
sudo service nginx restart
-### 8. Check application status
+## 8. Check application status
Check if GitLab and its environment are configured correctly:
@@ -79,8 +78,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (5.3)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.2 to 5.3`](5.2-to-5.3.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 5.2 to 5.3`](5.2-to-5.3.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
diff --git a/doc/update/5.4-to-6.0.md b/doc/update/5.4-to-6.0.md
index c289fcb57f..7bf7bce6aa 100644
--- a/doc/update/5.4-to-6.0.md
+++ b/doc/update/5.4-to-6.0.md
@@ -1,40 +1,47 @@
# From 5.4 to 6.0
## Warning
+
GitLab 6.0 is affected by critical security vulnerabilities CVE-2013-4490 and CVE-2013-4489.
-### Deprecations
+## Deprecations
-#### Global projects
+### Global projects
The root (global) namespace for projects is deprecated.
+
So you need to move all your global projects under groups or users manually before update or they will be automatically moved to the project owner namespace during the update. When a project is moved all its members will receive an email with instructions how to update their git remote url. Please make sure you disable sending email when you do a test of the upgrade.
-#### Teams
+### Teams
We introduce group membership in 6.0 as a replacement for teams.
+
The old combination of groups and teams was confusing for a lot of people.
+
And when the members of a team where changed this wasn't reflected in the project permissions.
+
In GitLab 6.0 you will be able to add members to a group with a permission level for each member.
+
These group members will have access to the projects in that group.
+
Any changes to group members will immediately be reflected in the project permissions.
+
You can even have multiple owners for a group, greatly simplifying administration.
-### 0. Backup
+## 0. Backup
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+It's useful to make a backup just in case things go south (with MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version):
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -42,7 +49,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout 6-0-stable
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -50,14 +57,14 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9
```
-### 4. Install additional packages
+## 4. Install additional packages
```bash
# For reStructuredText markup language support install required package:
sudo apt-get install python-docutils
```
-### 5. Install libs, migrations, etc.
+## 5. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -83,14 +90,14 @@ sudo -u git -H bundle exec rake assets:clean RAILS_ENV=production
sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
```
-### 6. Update config files
+## 6. Update config files
Note: We switched from Puma in GitLab 5.4 to unicorn in GitLab 6.0.
-* Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/unicorn.rb` the same as https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example but with your settings.
-### 7. Update Init script
+## 7. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -98,12 +105,12 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 8. Start application
+## 8. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+## 9. Check application status
Check if GitLab and its environment are configured correctly:
@@ -115,20 +122,24 @@ To make sure you didn't miss anything run a more thorough check with:
If all items are green, then congratulations upgrade complete!
-### Troubleshooting
+## Troubleshooting
+
The migrations in this update are very sensitive to incomplete or inconsistent data. If you have a long-running GitLab installation and some of the previous upgrades did not work out 100% correct this may bite you now. The following commands can be run in the rails console to look for 'bad' data.
-All project owners should have an owner
+All project owners should have an owner:
+
```
Project.all.select { |project| project.owner.blank? }
```
-Every user should have a namespace
+Every user should have a namespace:
+
```
User.all.select { |u| u.namespace.blank? }
```
-Projects in the global namespace should not conflict with projects in the owner namespace
+Projects in the global namespace should not conflict with projects in the owner namespace:
+
```
Project.where(namespace_id: nil).select { |p| Project.where(path: p.path, namespace_id: p.owner.try(:namespace).try(:id)).present? }
```
diff --git a/doc/update/6.0-to-6.1.md b/doc/update/6.0-to-6.1.md
index b4cc920358..36c7f04f63 100644
--- a/doc/update/6.0-to-6.1.md
+++ b/doc/update/6.0-to-6.1.md
@@ -1,32 +1,33 @@
# From 6.0 to 6.1
## Warning
+
GitLab 6.1 is affected by critical security vulnerabilities CVE-2013-4490 and CVE-2013-4489.
-# In 6.1 we remove a lot of deprecated code.
-# You should update to 6.0 before installing 6.1 so all the necessary conversions are run.
+**In 6.1 we remove a lot of deprecated code.**
-### Deprecations
+**You should update to 6.0 before installing 6.1 so all the necessary conversions are run.**
-#### Global issue numbers
+## Deprecations
-In 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their url. If you use an old issue number url and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
+### Global issue numbers
-### 0. Backup
+In 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their URL. If you use an old issue number URL and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+## 0. Backup
+
+It's useful to make a backup just in case things go south (with MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version):
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -35,7 +36,7 @@ sudo -u git -H git checkout 6-1-stable
# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-1-stable-ee
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -43,7 +44,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -62,12 +63,12 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
```
-### 5. Update config files
+## 5. Update config files
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-1-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-1-stable/config/unicorn.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-1-stable/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-1-stable/config/unicorn.rb.example but with your settings.
-### 6. Update Init script
+## 6. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -75,12 +76,12 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 7. Start application
+## 7. Start application
sudo service gitlab start
sudo service nginx restart
-### 8. Check application status
+## 8. Check application status
Check if GitLab and its environment are configured correctly:
@@ -96,8 +97,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (6.0)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
diff --git a/doc/update/6.0-to-6.8.md b/doc/update/6.0-to-6.8.md
index 5c71e99aa5..0205d0d2e2 100644
--- a/doc/update/6.0-to-6.8.md
+++ b/doc/update/6.0-to-6.8.md
@@ -1,15 +1,16 @@
# From 6.0 to 6.8
-# In 6.1 we remove a lot of deprecated code.
-# You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.
+**In 6.1 we remove a lot of deprecated code.**
-### Deprecations
+**You should update to 6.0 before installing 6.1 or higher so all the necessary conversions are run.**
-#### Global issue numbers
+## Deprecations
-As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their url. If you use an old issue number url and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
+## Global issue numbers
-### 0. Backup
+As of 6.1 issue numbers are project specific. This means all issues are renumbered and get a new number in their URL. If you use an old issue number URL and the issue number does not exist yet you are redirected to the new one. This conversion does not trigger if the old number already exists for this project, this is unlikely but will happen with old issues and large projects.
+
+## 0. Backup
It's useful to make a backup just in case things go south:
(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
@@ -19,18 +20,18 @@ cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
sudo -u git -H git fetch --all
```
-For Gitlab Community Edition:
+For GitLab Community Edition:
```bash
sudo -u git -H git checkout 6-8-stable
@@ -45,14 +46,14 @@ sudo -u git -H git checkout 6-8-stable-ee
```
-### 3. Install additional packages
+## 3. Install additional packages
```bash
# Add support for lograte for better log file handling
sudo apt-get install logrotate
```
-### 4. Update gitlab-shell
+## 4. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -60,7 +61,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.3 # Addresses multiple critical security vulnerabilities
```
-### 5. Install libs, migrations, etc.
+## 5. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -85,7 +86,7 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
```
-### 6. Update config files
+## 6. Update config files
TIP: to see what changed in gitlab.yml.example in this release use next command:
@@ -108,18 +109,18 @@ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers
sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
```
-### 7. Update Init script
+## 7. Update Init script
```bash
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
```
-### 8. Start application
+## 8. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+## 9. Check application status
Check if GitLab and its environment are configured correctly:
@@ -135,8 +136,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (6.0)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 5.4 to 6.0`](5.4-to-6.0.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
@@ -146,4 +147,5 @@ sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
## Login issues after upgrade?
-If running in https mode, be sure to read [Can't Verify csrf token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page)
+
+If running in HTTPS mode, be sure to read [Can't Verify CSRF token authenticity](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page)
diff --git a/doc/update/6.1-to-6.2.md b/doc/update/6.1-to-6.2.md
index c618e599dc..9ab53aae24 100644
--- a/doc/update/6.1-to-6.2.md
+++ b/doc/update/6.1-to-6.2.md
@@ -1,22 +1,21 @@
# From 6.1 to 6.2
-# You should update to 6.1 before installing 6.2 so all the necessary conversions are run.
+**You should update to 6.1 before installing 6.2 so all the necessary conversions are run.**
-### 0. Backup
+## 0. Backup
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+It's useful to make a backup just in case things go south: (With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version).
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -25,7 +24,7 @@ sudo -u git -H git checkout 6-2-stable # Latest version of 6-2-stable addresses
# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-2-stable-ee
```
-### 3. Update gitlab-shell
+## 3. Update gitlab-shell
```bash
cd /home/git/gitlab-shell
@@ -33,14 +32,14 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulnerabilities
```
-### 4. Install additional packages
+## 4. Install additional packages
```bash
# Add support for lograte for better log file handling
sudo apt-get install logrotate
```
-### 5. Install libs, migrations, etc.
+## 5. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -58,29 +57,33 @@ sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
sudo -u git -H bundle exec rake cache:clear RAILS_ENV=production
```
-### 6. Update config files
+## 6. Update config files
-TIP: to see what changed in gitlab.yml.example in this release use next command:
+TIP: to see what changed in `gitlab.yml.example` in this release use next command:
```
git diff 6-1-stable:config/gitlab.yml.example 6-2-stable:config/gitlab.yml.example
```
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-2-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-2-stable/config/unicorn.rb.example but with your settings.
-* Copy rack attack middleware config
+- Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-2-stable/config/gitlab.yml.example but with your settings.
-```bash
-sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
-```
-* Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`
-* Set up logrotate
+- Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-2-stable/config/unicorn.rb.example but with your settings.
+
+- Copy rack attack middleware config:
+
+ ```bash
+ sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
+ ```
+
+- Uncomment `config.middleware.use Rack::Attack` in `/home/git/gitlab/config/application.rb`
+
+- Set up logrotate.
```bash
sudo cp lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
```
-### 7. Update Init script
+## 7. Update Init script
```bash
sudo rm /etc/init.d/gitlab
@@ -88,12 +91,12 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 8. Start application
+## 8. Start application
sudo service gitlab start
sudo service nginx restart
-### 9. Check application status
+## 9. Check application status
Check if GitLab and its environment are configured correctly:
@@ -108,8 +111,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (6.1)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 6.0 to 6.1`](6.0-to-6.1.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 6.0 to 6.1`](6.0-to-6.1.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
diff --git a/doc/update/6.2-to-6.3.md b/doc/update/6.2-to-6.3.md
index 7f91604736..dfe2e551b3 100644
--- a/doc/update/6.2-to-6.3.md
+++ b/doc/update/6.2-to-6.3.md
@@ -1,22 +1,21 @@
# From 6.2 to 6.3
-## Requires version: 6.1 or 6.2
+**Requires version: 6.1 or 6.2.**
-### 0. Backup
+## 0. Backup
-It's useful to make a backup just in case things go south:
-(With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
+It's useful to make a backup just in case things go south: (With MySQL, this may require granting "LOCK TABLES" privileges to the GitLab user on the database version)
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -25,7 +24,7 @@ sudo -u git -H git checkout 6-3-stable
# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-3-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+## 3. Update gitlab-shell (and its config)
```bash
cd /home/git/gitlab-shell
@@ -33,9 +32,9 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.7.9 # Addresses multiple critical security vulnerabilities
```
-The Gitlab-shell config changed recently, so check for config file changes and make `/home/git/gitlab-shell/config.yml` the same as https://github.com/gitlabhq/gitlab-shell/blob/master/config.yml.example
+The Gitlab-shell config changed recently, so check for config file changes and make `/home/git/gitlab-shell/config.yml` the same as
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -54,7 +53,7 @@ sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
```
-### 5. Update config files
+## 5. Update config files
TIP: to see what changed in gitlab.yml.example in this release use next command:
@@ -62,8 +61,8 @@ TIP: to see what changed in gitlab.yml.example in this release use next command:
git diff 6-2-stable:config/gitlab.yml.example 6-3-stable:config/gitlab.yml.example
```
-* Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-3-stable/config/gitlab.yml.example but with your settings.
-* Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-3-stable/config/unicorn.rb.example but with your settings.
+- Make `/home/git/gitlab/config/gitlab.yml` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-3-stable/config/gitlab.yml.example but with your settings.
+- Make `/home/git/gitlab/config/unicorn.rb` same as https://gitlab.com/gitlab-org/gitlab-ce/blob/6-3-stable/config/unicorn.rb.example but with your settings.
```bash
# Copy rack attack middleware config
@@ -71,19 +70,19 @@ cd /home/git/gitlab
sudo -u git -H cp config/initializers/rack_attack.rb.example config/initializers/rack_attack.rb
```
-### 6. Update Init script
+## 6. Update Init script
```bash
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
```
-### 7. Start application
+## 7. Start application
sudo service gitlab start
sudo service nginx restart
-### 8. Check application status
+## 8. Check application status
Check if GitLab and its environment are configured correctly:
@@ -98,8 +97,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (6.2)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 6.1 to 6.2`](6.1-to-6.2.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 6.1 to 6.2`](6.1-to-6.2.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
diff --git a/doc/update/6.3-to-6.4.md b/doc/update/6.3-to-6.4.md
index cfe75a6f14..18dce9b5f9 100644
--- a/doc/update/6.3-to-6.4.md
+++ b/doc/update/6.3-to-6.4.md
@@ -1,19 +1,19 @@
# From 6.3 to 6.4
-### 0. Backup
+## 0. Backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
```bash
sudo service gitlab stop
````
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -22,7 +22,7 @@ sudo -u git -H git checkout 6-4-stable
# For GitLab Enterprise Edition: sudo -u git -H git checkout 6-4-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+## 3. Update gitlab-shell (and its config)
```bash
cd /home/git/gitlab-shell
@@ -30,7 +30,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.8.0
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -52,14 +52,14 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
```
-### 5. Start application
+## 5. Start application
```bash
sudo service gitlab start
sudo service nginx restart
```
-### 6. Check application status
+## 6. Check application status
Check if GitLab and its environment are configured correctly:
@@ -78,8 +78,8 @@ If all items are green, then congratulations upgrade complete!
## Things went south? Revert to previous version (6.3)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 6.2 to 6.3`](6.2-to-6.3.md), except for the database migration
-(The backup is already migrated to the previous version)
+
+Follow the [`upgrade guide from 6.2 to 6.3`](6.2-to-6.3.md), except for the database migration (the backup is already migrated to the previous version).
### 2. Restore from the backup:
diff --git a/doc/update/6.4-to-6.5.md b/doc/update/6.4-to-6.5.md
index c88be3582c..1a95a98b6f 100644
--- a/doc/update/6.4-to-6.5.md
+++ b/doc/update/6.4-to-6.5.md
@@ -1,24 +1,24 @@
# From 6.4 to 6.5
-### 0. Backup
+## 0. Backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
sudo -u git -H git fetch --all
```
-For Gitlab Community Edition:
+For GitLab Community Edition:
```bash
sudo -u git -H git checkout 6-5-stable
@@ -32,7 +32,7 @@ For GitLab Enterprise Edition:
sudo -u git -H git checkout 6-5-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+## 3. Update gitlab-shell (and its config)
```bash
cd /home/git/gitlab-shell
@@ -40,7 +40,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.8.0
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -62,12 +62,12 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
```
-### 5. Start application
+## 5. Start application
sudo service gitlab start
sudo service nginx restart
-### 6. Check application status
+## 6. Check application status
Check if GitLab and its environment are configured correctly:
@@ -82,13 +82,14 @@ If all items are green, then congratulations upgrade is complete!
## Things went south? Revert to previous version (6.4)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 6.3 to 6.4`](6.3-to-6.4.md), except for the database migration
-(The backup is already migrated to the previous version)
-### 2. Restore from the backup:
+Follow the [`upgrade guide from 6.3 to 6.4`](6.3-to-6.4.md), except for the database migration (the backup is already migrated to the previous version).
+
+### 2. Restore from the backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
+
If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.
diff --git a/doc/update/6.5-to-6.6.md b/doc/update/6.5-to-6.6.md
index 589c18c27c..ee6a5a9bdf 100644
--- a/doc/update/6.5-to-6.6.md
+++ b/doc/update/6.5-to-6.6.md
@@ -1,24 +1,24 @@
# From 6.5 to 6.6
-### 0. Backup
+## 0. Backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
sudo -u git -H git fetch --all
```
-For Gitlab Community Edition:
+For GitLab Community Edition:
```bash
sudo -u git -H git checkout 6-6-stable
@@ -32,7 +32,7 @@ For GitLab Enterprise Edition:
sudo -u git -H git checkout 6-6-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+## 3. Update gitlab-shell (and its config)
```bash
cd /home/git/gitlab-shell
@@ -40,7 +40,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.8.0
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -62,12 +62,12 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
```
-### 5. Start application
+## 5. Start application
sudo service gitlab start
sudo service nginx restart
-### 6. Check application status
+## 6. Check application status
Check if GitLab and its environment are configured correctly:
@@ -82,6 +82,7 @@ If all items are green, then congratulations upgrade is complete!
## Things went south? Revert to previous version (6.5)
### 1. Revert the code to the previous version
+
Follow the [`upgrade guide from 6.4 to 6.5`](6.4-to-6.5.md), except for the database migration
(The backup is already migrated to the previous version)
@@ -91,4 +92,5 @@ Follow the [`upgrade guide from 6.4 to 6.5`](6.4-to-6.5.md), except for the data
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
+
If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.
diff --git a/doc/update/6.6-to-6.7.md b/doc/update/6.6-to-6.7.md
index 61a63057d0..1e3b7da12d 100644
--- a/doc/update/6.6-to-6.7.md
+++ b/doc/update/6.6-to-6.7.md
@@ -1,17 +1,17 @@
# From 6.6 to 6.7
-### 0. Backup
+## 0. Backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
sudo service gitlab stop
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
@@ -32,7 +32,7 @@ For GitLab Enterprise Edition:
sudo -u git -H git checkout 6-7-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+## 3. Update gitlab-shell (and its config)
```bash
cd /home/git/gitlab-shell
@@ -40,7 +40,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.1
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -69,16 +69,15 @@ sudo -u git -H gzip /home/git/gitlab/log/*.log.1
sudo -u git -H gzip /home/git/gitlab-shell/gitlab-shell.log.1
# Close access to gitlab-satellites for others
-sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
+sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
```
-
-### 5. Start application
+## 5. Start application
sudo service gitlab start
sudo service nginx restart
-### 6. Check application status
+## 6. Check application status
Check if GitLab and its environment are configured correctly:
@@ -93,13 +92,14 @@ If all items are green, then congratulations upgrade is complete!
## Things went south? Revert to previous version (6.6)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 6.5 to 6.6`](6.5-to-6.6.md), except for the database migration
-(The backup is already migrated to the previous version)
-### 2. Restore from the backup:
+Follow the [`upgrade guide from 6.5 to 6.6`](6.5-to-6.6.md), except for the database migration (the backup is already migrated to the previous version).
+
+### 2. Restore from the backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
```
+
If you have more than one backup *.tar file(s) please add `BACKUP=timestamp_of_backup` to the command above.
diff --git a/doc/update/6.7-to-6.8.md b/doc/update/6.7-to-6.8.md
index cb19d23581..3c98896a9b 100644
--- a/doc/update/6.7-to-6.8.md
+++ b/doc/update/6.7-to-6.8.md
@@ -1,26 +1,26 @@
# From 6.7 to 6.8
-### 0. Backup
+## 0. Backup
```bash
cd /home/git/gitlab
sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
```
-### 1. Stop server
+## 1. Stop server
```bash
sudo service gitlab stop
```
-### 2. Get latest code
+## 2. Get latest code
```bash
cd /home/git/gitlab
sudo -u git -H git fetch --all
```
-For Gitlab Community Edition:
+For GitLab Community Edition:
```bash
sudo -u git -H git checkout 6-8-stable
@@ -34,7 +34,7 @@ For GitLab Enterprise Edition:
sudo -u git -H git checkout 6-8-stable-ee
```
-### 3. Update gitlab-shell (and its config)
+## 3. Update gitlab-shell (and its config)
```bash
cd /home/git/gitlab-shell
@@ -42,7 +42,7 @@ sudo -u git -H git fetch
sudo -u git -H git checkout v1.9.3
```
-### 4. Install libs, migrations, etc.
+## 4. Install libs, migrations, etc.
```bash
cd /home/git/gitlab
@@ -65,12 +65,12 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
sudo chmod +x /etc/init.d/gitlab
# Close access to gitlab-satellites for others
-sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
+sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
```
-### 5. Update config files
+## 5. Update config files
-#### New configuration options for gitlab.yml
+### New configuration options for gitlab.yml
There are new configuration options available for gitlab.yml. View them with the command below and apply them to your current gitlab.yml if desired.
@@ -78,24 +78,24 @@ There are new configuration options available for gitlab.yml. View them with the
git diff 6-7-stable:config/gitlab.yml.example 6-8-stable:config/gitlab.yml.example
```
-#### MySQL? Remove reaping frequency
+### MySQL? Remove reaping frequency
If you are using MySQL as a database, remove `reaping_frequency` from you database.yml to prevent crashes. [Relevant commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/5163a8fcb9cfd63435560fda00173b76df2ccc93).
-#### HTTPS? Disable gzip
+### HTTPS? Disable gzip
If you are using HTTPS, disable gzip as in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/563fec734912d81cd7caea6fa8ec2b397fb72a9b) to prevent BREACH attacks.
-#### Turn on asset compression
+### Turn on asset compression
To improve performance, enable gzip asset compression as seen [in this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/8af94ed75505f0253823b9b2d44320fecea5b5fb).
-### 6. Start application
+## 6. Start application
sudo service gitlab start
sudo service nginx restart
-### 7. Check application status
+## 7. Check application status
Check if GitLab and its environment are configured correctly:
@@ -110,10 +110,10 @@ If all items are green, then congratulations upgrade is complete!
## Things went south? Revert to previous version (6.7)
### 1. Revert the code to the previous version
-Follow the [`upgrade guide from 6.6 to 6.7`](6.6-to-6.7.md), except for the database migration
-(The backup is already migrated to the previous version)
-### 2. Restore from the backup:
+Follow the [`upgrade guide from 6.6 to 6.7`](6.6-to-6.7.md), except for the database migration (the backup is already migrated to the previous version).
+
+### 2. Restore from the backup
```bash
cd /home/git/gitlab
diff --git a/doc/update/6.8-to-6.9.md b/doc/update/6.8-to-6.9.md
index a5e644b8a0..4a3e45ae5e 100644
--- a/doc/update/6.8-to-6.9.md
+++ b/doc/update/6.8-to-6.9.md
@@ -52,6 +52,12 @@ sudo -u git -H bundle install --without development test postgres --deployment
# PostgreSQL installations (note: the line below states '--without ... mysql')
sudo -u git -H bundle install --without development test mysql --deployment
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
```
### 5. Update config files
diff --git a/doc/update/README.md b/doc/update/README.md
index 9ce48a019e..8c0cf5f7b2 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -1,5 +1,5 @@
-+ [The individual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update)
-+ [Upgrader](upgrader.md)
-+ [Ruby](ruby.md)
-+ [Patch versions](patch_versions.md)
-+ [MySQL to PostgreSQL](mysql_to_postgresql.md)
+- [The individual upgrade guides](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/doc/update)
+- [Upgrader](upgrader.md)
+- [Ruby](ruby.md)
+- [Patch versions](patch_versions.md)
+- [MySQL to PostgreSQL](mysql_to_postgresql.md)
diff --git a/doc/update/mysql_to_postgresql.md b/doc/update/mysql_to_postgresql.md
index acd1e33f59..05c9567967 100644
--- a/doc/update/mysql_to_postgresql.md
+++ b/doc/update/mysql_to_postgresql.md
@@ -1,11 +1,6 @@
# Migrating GitLab from MySQL to Postgres
-If you are replacing MySQL with Postgres while keeping GitLab on the same
-server all you need to do is to export from MySQL, import into Postgres and
-rebuild the indexes as described below. If you are also moving GitLab to
-another server, or if you are switching to omnibus-gitlab, you may want to use
-a GitLab backup file. The second part of this documents explains the procedure
-to do this.
+If you are replacing MySQL with Postgres while keeping GitLab on the same server all you need to do is to export from MySQL, import into Postgres and rebuild the indexes as described below. If you are also moving GitLab to another server, or if you are switching to omnibus-gitlab, you may want to use a GitLab backup file. The second part of this documents explains the procedure to do this.
## Export from MySQL and import into Postgres
@@ -27,36 +22,54 @@ psql -f databasename.psql -d gitlabhq_production
sudo service gitlab start
```
-
## Rebuild indexes
-The lanyrd database converter script does not preserve all indexes, so we have
-to recreate them ourselves after migrating from MySQL. It is not necessary to
-shut down GitLab for this process.
+The lanyrd database converter script does not preserve all indexes, so we have to recreate them ourselves after migrating from MySQL. It is not necessary to shut down GitLab for this process.
+
+### For non-omnibus installations
+
+On non-omnibus installations (distributed using Git) we retrieve the index declarations from version control using `git stash`.
```
# Clone the database converter on your Postgres-backed GitLab server
cd /tmp
git clone https://github.com/gitlabhq/mysql-postgresql-converter.git
-# Stash changes to db/schema.rb to make sure we can find the right index statements
cd /home/git/gitlab
+
+# Stash changes to db/schema.rb to make sure we can find the right index statements
sudo -u git -H git stash
-# Generate the `CREATE INDEX CONCURRENTLY` statements based on schema.rb
-cd /tmp/mysql-to-postgresql-converter
-ruby index_create_statements.rb /home/git/gitlab/db/schema.rb > index_create_statements.psql
+# Generate add_index.rb
+ruby /tmp/mysql-postgresql-converter/add_index_statements.rb db/schema.rb > /tmp/mysql-postgresql-converter/add_index.rb
-# Execute the SQL statements against the GitLab database
-sudo -u git psql -f index_create_statements.psql -d gitlabhq_production
+# Create the indexes
+sudo -u git -H bundle exec rails runner -e production 'eval $stdin.read' < /tmp/mysql-postgresql-converter/add_index.rb
+```
+
+### For omnibus-gitlab installations
+
+On omnibus-gitlab we need to get the index declarations from a file called `schema.rb.bundled`. For versions older than 6.9, we need to download the file.
+
+```
+# Clone the database converter on your Postgres-backed GitLab server
+cd /tmp
+/opt/gitlab/embedded/bin/git clone https://github.com/gitlabhq/mysql-postgresql-converter.git
+cd /tmp/mysql-postgresql-converter
+
+# Download schema.rb.bundled if necessary
+test -e /opt/gitlab/embedded/service/gitlab-rails/db/schema.rb.bundled || sudo /opt/gitlab/embedded/bin/curl -o /opt/gitlab/embedded/service/gitlab-rails/db/schema.rb.bundled https://gitlab.com/gitlab-org/gitlab-ce/raw/v6.9.1/db/schema.rb
+
+# Generate add_index.rb
+/opt/gitlab/embedded/bin/ruby add_index_statements.rb /opt/gitlab/embedded/service/gitlab-rails/db/schema.rb.bundled > add_index.rb
+
+# Create the indexes
+/opt/gitlab/bin/gitlab-rails runner 'eval $stdin.read' < add_index.rb
```
## Converting a GitLab backup file from MySQL to Postgres
-GitLab backup files (_gitlab_backup.tar) contain a SQL dump. Using
-the lanyrd database converter we can replace a MySQL database dump inside the
-tar file with a Postgres database dump. This can be useful if you are moving to
-another server.
+GitLab backup files (_gitlab_backup.tar) contain a SQL dump. Using the lanyrd database converter we can replace a MySQL database dump inside the tar file with a Postgres database dump. This can be useful if you are moving to another server.
```
# Stop GitLab
diff --git a/doc/update/patch_versions.md b/doc/update/patch_versions.md
index 2b947adaa1..c4a77d1280 100644
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
@@ -1,4 +1,6 @@
-# Universal update guide for patch versions. For example from 6.2.0 to 6.2.1, also see the [semantic versioning specification](http://semver.org/).
+# Universal update guide for patch versions
+
+For example from 6.2.0 to 6.2.1, also see the [semantic versioning specification](http://semver.org/).
### 0. Backup
diff --git a/doc/update/ruby.md b/doc/update/ruby.md
index e98167f6b6..d1d9d3e77f 100644
--- a/doc/update/ruby.md
+++ b/doc/update/ruby.md
@@ -2,28 +2,31 @@
This guide explains how to update Ruby in case you installed it from source according to the [instructions](../install/installation.md#2-ruby).
-### 1. Look for Ruby versions
+## 1. Look for Ruby versions
+
This guide will only update `/usr/local/bin/ruby`. You can see which Ruby binaries are installed on your system by running:
```bash
ls -l $(which -a ruby)
```
-### 2. Stop GitLab
+## 2. Stop GitLab
```bash
sudo service gitlab stop
```
-### 3. Install or update dependencies
+## 3. Install or update dependencies
+
Here we are assuming you are using Debian/Ubuntu.
```bash
sudo apt-get install build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl
```
-### 4. Download, compile and install Ruby
-Find the latest stable version of Ruby 1.9 or 2.0 at https://www.ruby-lang.org/en/downloads/ . We recommend at least 2.0.0-p353, which is patched against [CVE-2013-4164](https://www.ruby-lang.org/en/news/2013/11/22/heap-overflow-in-floating-point-parsing-cve-2013-4164/).
+## 4. Download, compile and install Ruby
+
+Find the latest stable version of Ruby 1.9 or 2.0 at Home ")
+ end
+
+ it "should include rel=nofollow for external links" do
+ expect(link_to("Example", "http://www.example.com")).to eq("Example ")
+ end
+
+ it "should include re=nofollow for external links and honor existing html_options" do
+ expect(
+ link_to("Example", "http://www.example.com", class: "toggle", data: {toggle: "dropdown"})
+ ).to eq("Example ")
+ end
+
+ it "should include rel=nofollow for external links and preserver other rel values" do
+ expect(
+ link_to("Example", "http://www.example.com", rel: "noreferrer")
+ ).to eq("Example ")
+ end
+ end
end
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 49b48d26e2..fc9d1ac90c 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -41,7 +41,8 @@ describe GitlabMarkdownHelper do
end
it "should forward HTML options to links" do
- gfm("Fixed in #{commit.id}", class: "foo").should have_selector("a.gfm.foo")
+ gfm("Fixed in #{commit.id}", @project, class: 'foo').
+ should have_selector('a.gfm.foo')
end
describe "referencing a commit" do
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index dce28525ca..3ecabbaf04 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -8,7 +8,7 @@ describe NotificationsHelper do
before { notification.stub(disabled?: true) }
it "has a red icon" do
- notification_icon(notification).should match('class="icon-volume-off cred"')
+ notification_icon(notification).should match('class="icon-volume-off ns-mute"')
end
end
@@ -16,7 +16,7 @@ describe NotificationsHelper do
before { notification.stub(participating?: true) }
it "has a blue icon" do
- notification_icon(notification).should match('class="icon-volume-down cblue"')
+ notification_icon(notification).should match('class="icon-volume-down ns-part"')
end
end
@@ -24,12 +24,12 @@ describe NotificationsHelper do
before { notification.stub(watch?: true) }
it "has a green icon" do
- notification_icon(notification).should match('class="icon-volume-up cgreen"')
+ notification_icon(notification).should match('class="icon-volume-up ns-watch"')
end
end
it "has a blue icon" do
- notification_icon(notification).should match('class="icon-circle-blank cblue"')
+ notification_icon(notification).should match('class="icon-circle-blank ns-default"')
end
end
end
diff --git a/spec/helpers/submodule_helper_spec.rb b/spec/helpers/submodule_helper_spec.rb
index 20378b1b17..41c9f038c2 100644
--- a/spec/helpers/submodule_helper_spec.rb
+++ b/spec/helpers/submodule_helper_spec.rb
@@ -16,7 +16,8 @@ describe SubmoduleHelper do
end
it 'should detect ssh on standard port' do
- Gitlab.config.gitlab.stub(ssh_port: 22) # set this just to be sure
+ Gitlab.config.gitlab_shell.stub(ssh_port: 22) # set this just to be sure
+ Gitlab.config.gitlab_shell.stub(ssh_path_prefix: Settings.send(:build_gitlab_shell_ssh_path_prefix))
stub_url([ config.user, '@', config.host, ':gitlab-org/gitlab-ce.git' ].join(''))
submodule_links(submodule_item).should == [ project_path('gitlab-org/gitlab-ce'), project_tree_path('gitlab-org/gitlab-ce', 'hash') ]
end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 547268d44f..ab26b290d7 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -10,7 +10,7 @@ describe Notify do
shared_examples 'a multiple recipients email' do
it 'is sent to the given recipient' do
- should deliver_to recipient.email
+ should cc_to recipient.email
end
end
@@ -22,6 +22,23 @@ describe Notify do
end
end
+ shared_examples 'an email starting a new thread' do |message_id_prefix|
+ it 'has a discussion identifier' do
+ should have_header 'Message-ID', /<#{message_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
+ end
+ end
+
+ shared_examples 'an answer to an existing thread' do |thread_id_prefix|
+ it 'has a subject that begins with Re: ' do
+ should have_subject /^Re: /
+ end
+
+ it 'has headers that reference an existing thread' do
+ should have_header 'References', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
+ should have_header 'In-Reply-To', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
+ end
+ end
+
describe 'for new users, the email' do
let(:example_site_path) { root_path }
let(:new_user) { create(:user, email: 'newguy@example.com', created_by_id: 1) }
@@ -141,7 +158,7 @@ describe Notify do
end
it 'is sent to the assignee' do
- should deliver_to assignee.email
+ should cc_to assignee.email
end
end
@@ -153,6 +170,7 @@ describe Notify do
subject { Notify.new_issue_email(issue.assignee_id, issue.id) }
it_behaves_like 'an assignee email'
+ it_behaves_like 'an email starting a new thread', 'issue'
it 'has the correct subject' do
should have_subject /#{project.name} \| #{issue.title} \(##{issue.iid}\)/
@@ -161,10 +179,6 @@ describe Notify do
it 'contains a link to the new issue' do
should have_body_text /#{project_issue_path project, issue}/
end
-
- it 'has the correct message-id set' do
- should have_header 'Message-ID', ""
- end
end
describe 'that are new with a description' do
@@ -179,6 +193,7 @@ describe Notify do
subject { Notify.reassigned_issue_email(recipient.id, issue.id, previous_assignee.id, current_user) }
it_behaves_like 'a multiple recipients email'
+ it_behaves_like 'an answer to an existing thread', 'issue'
it 'is sent as the author' do
sender = subject.header[:from].addrs[0]
@@ -201,16 +216,14 @@ describe Notify do
it 'contains a link to the issue' do
should have_body_text /#{project_issue_path project, issue}/
end
-
- it 'has the correct reference set' do
- should have_header 'References', ""
- end
end
describe 'status changed' do
let(:status) { 'closed' }
subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
+ it_behaves_like 'an answer to an existing thread', 'issue'
+
it 'is sent as the author' do
sender = subject.header[:from].addrs[0]
sender.display_name.should eq(current_user.name)
@@ -232,10 +245,6 @@ describe Notify do
it 'contains a link to the issue' do
should have_body_text /#{project_issue_path project, issue}/
end
-
- it 'has the correct reference set' do
- should have_header 'References', ""
- end
end
end
@@ -249,6 +258,7 @@ describe Notify do
subject { Notify.new_merge_request_email(merge_request.assignee_id, merge_request.id) }
it_behaves_like 'an assignee email'
+ it_behaves_like 'an email starting a new thread', 'merge_request'
it 'has the correct subject' do
should have_subject /#{merge_request.title} \(##{merge_request.iid}\)/
@@ -283,6 +293,7 @@ describe Notify do
subject { Notify.reassigned_merge_request_email(recipient.id, merge_request.id, previous_assignee.id, current_user.id) }
it_behaves_like 'a multiple recipients email'
+ it_behaves_like 'an answer to an existing thread', 'merge_request'
it 'is sent as the author' do
sender = subject.header[:from].addrs[0]
@@ -311,6 +322,7 @@ describe Notify do
subject { Notify.merged_merge_request_email(recipient.id, merge_request.id, merge_author.id) }
it_behaves_like 'a multiple recipients email'
+ it_behaves_like 'an answer to an existing thread', 'merge_request'
it 'is sent as the merge author' do
sender = subject.header[:from].addrs[0]
@@ -329,10 +341,6 @@ describe Notify do
it 'contains a link to the merge request' do
should have_body_text /#{project_merge_request_path project, merge_request}/
end
-
- it 'has the correct reference set' do
- should have_header 'References', ""
- end
end
end
end
@@ -394,7 +402,7 @@ describe Notify do
end
it 'is sent to the given recipient' do
- should deliver_to recipient.email
+ should cc_to recipient.email
end
it 'contains the message from the note' do
@@ -402,22 +410,6 @@ describe Notify do
end
end
- describe 'on a project wall' do
- let(:note_on_the_wall_path) { project_wall_path(project, anchor: "note_#{note.id}") }
-
- subject { Notify.note_wall_email(recipient.id, note.id) }
-
- it_behaves_like 'a note email'
-
- it 'has the correct subject' do
- should have_subject /#{project.name}/
- end
-
- it 'contains a link to the wall note' do
- should have_body_text /#{note_on_the_wall_path}/
- end
- end
-
describe 'on a commit' do
let(:commit) { project.repository.commit }
@@ -426,6 +418,7 @@ describe Notify do
subject { Notify.note_commit_email(recipient.id, note.id) }
it_behaves_like 'a note email'
+ it_behaves_like 'an answer to an existing thread', 'commits'
it 'has the correct subject' do
should have_subject /#{commit.title} \(#{commit.short_id}\)/
@@ -444,6 +437,7 @@ describe Notify do
subject { Notify.note_merge_request_email(recipient.id, note.id) }
it_behaves_like 'a note email'
+ it_behaves_like 'an answer to an existing thread', 'merge_request'
it 'has the correct subject' do
should have_subject /#{merge_request.title} \(##{merge_request.iid}\)/
@@ -462,6 +456,7 @@ describe Notify do
subject { Notify.note_issue_email(recipient.id, note.id) }
it_behaves_like 'a note email'
+ it_behaves_like 'an answer to an existing thread', 'issue'
it 'has the correct subject' do
should have_subject /#{issue.title} \(##{issue.iid}\)/
@@ -538,11 +533,11 @@ describe Notify do
end
it 'is sent to recipient' do
- should deliver_to 'devs@company.name'
+ should cc_to 'devs@company.name'
end
it 'has the correct subject' do
- should have_subject /New push to repository/
+ should have_subject /#{commits.length} new commits pushed to repository/
end
it 'includes commits list' do
@@ -574,11 +569,11 @@ describe Notify do
end
it 'is sent to recipient' do
- should deliver_to 'devs@company.name'
+ should cc_to 'devs@company.name'
end
it 'has the correct subject' do
- should have_subject /New push to repository/
+ should have_subject /#{commits.first.title}/
end
it 'includes commits list' do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 93e928da19..df1e6b70ad 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -82,25 +82,6 @@ describe MergeRequest do
end
end
- describe '#allow_source_branch_removal?' do
- it 'should not allow removal when mr is a fork' do
-
- subject.disallow_source_branch_removal?.should be_true
- end
- it 'should not allow removal when the mr is not a fork, but the source branch is the root reference' do
- subject.target_project = subject.source_project
- subject.source_branch = subject.source_project.repository.root_ref
- subject.disallow_source_branch_removal?.should be_true
- end
-
- it 'should not disallow removal when the mr is not a fork, and but source branch is not the root reference' do
- subject.target_project = subject.source_project
- subject.source_branch = "Something Different #{subject.source_project.repository.root_ref}"
- subject.for_fork?.should be_false
- subject.disallow_source_branch_removal?.should be_false
- end
- end
-
describe 'detection of issues to be closed' do
let(:issue0) { create :issue, project: subject.project }
let(:issue1) { create :issue, project: subject.project }
@@ -125,6 +106,14 @@ describe MergeRequest do
subject.closes_issues.should be_empty
end
+ it 'detects issues mentioned in the description' do
+ issue2 = create(:issue, project: subject.project)
+ subject.description = "Closes ##{issue2.iid}"
+ subject.project.stub(default_branch: subject.target_branch)
+
+ subject.closes_issues.should include(issue2)
+ end
+
context 'for a project with JIRA integration' do
let(:issue0) { JiraIssue.new('JIRA-123') }
let(:issue1) { JiraIssue.new('FOOBAR-4567') }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index b42d7bfe60..a2519fbd68 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -84,7 +84,6 @@ describe Project do
it { should respond_to(:satellite) }
it { should respond_to(:update_merge_requests) }
it { should respond_to(:execute_hooks) }
- it { should respond_to(:transfer) }
it { should respond_to(:name_with_namespace) }
it { should respond_to(:owner) }
it { should respond_to(:path_with_namespace) }
diff --git a/spec/models/project_team_spec.rb b/spec/models/project_team_spec.rb
index 3e3543e85e..1cc37719e7 100644
--- a/spec/models/project_team_spec.rb
+++ b/spec/models/project_team_spec.rb
@@ -1,15 +1,36 @@
require "spec_helper"
describe ProjectTeam do
- let(:team) { create(:project).team }
+ let(:group) { create(:group) }
+ let(:project) { create(:empty_project, group: group) }
- describe "Respond to" do
- subject { team }
+ let(:master) { create(:user) }
+ let(:reporter) { create(:user) }
+ let(:guest) { create(:user) }
+ let(:nonmember) { create(:user) }
- it { should respond_to(:developers) }
- it { should respond_to(:masters) }
- it { should respond_to(:reporters) }
- it { should respond_to(:guests) }
+ before do
+ group.add_user(master, Gitlab::Access::MASTER)
+ group.add_user(reporter, Gitlab::Access::REPORTER)
+ group.add_user(guest, Gitlab::Access::GUEST)
+
+ # Add group guest as master to this project
+ # to test project access priority over group members
+ project.team << [guest, :master]
+ end
+
+ describe 'members collection' do
+ it { project.team.masters.should include(master) }
+ it { project.team.masters.should include(guest) }
+ it { project.team.masters.should_not include(reporter) }
+ it { project.team.masters.should_not include(nonmember) }
+ end
+
+ describe 'access methods' do
+ it { project.team.master?(master).should be_true }
+ it { project.team.master?(guest).should be_true }
+ it { project.team.master?(reporter).should be_false }
+ it { project.team.master?(nonmember).should be_false }
end
end
diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb
index 7314439730..47d6d861d7 100644
--- a/spec/models/system_hook_spec.rb
+++ b/spec/models/system_hook_spec.rb
@@ -59,7 +59,7 @@ describe SystemHook do
user = create(:user)
project = create(:project)
project.team << [user, :master]
- project.users_projects.clear
+ project.users_projects.destroy_all
WebMock.should have_requested(:post, @system_hook.url).with(body: /user_remove_from_team/).once
end
end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 34a5bcfb4a..4e0ebb584d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -83,11 +83,17 @@ describe User do
user = build(:user, email: 'info@example.com')
expect(user).to be_valid
end
+
it 'accepts info+test@example.com' do
user = build(:user, email: 'info+test@example.com')
expect(user).to be_valid
end
+ it "accepts o'reilly@example.com" do
+ user = build(:user, email: "o'reilly@example.com")
+ expect(user).to be_valid
+ end
+
it 'rejects test@test@example.com' do
user = build(:user, email: 'test@test@example.com')
expect(user).to be_invalid
@@ -97,6 +103,11 @@ describe User do
user = build(:user, email: 'mailto:test@example.com')
expect(user).to be_invalid
end
+
+ it "rejects lol!'+=?><#$%^&*()@gmail.com" do
+ user = build(:user, email: "lol!'+=?><#$%^&*()@gmail.com")
+ expect(user).to be_invalid
+ end
end
end
diff --git a/spec/requests/api/branches_spec.rb b/spec/requests/api/branches_spec.rb
index abf6a8646e..72589da5d4 100644
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_spec.rb
@@ -91,7 +91,6 @@ describe API::API, api: true do
end
end
-
describe "POST /projects/:id/repository/branches" do
it "should create a new branch" do
post api("/projects/#{project.id}/repository/branches", user),
@@ -112,4 +111,26 @@ describe API::API, api: true do
response.status.should == 403
end
end
+
+ describe "DELETE /projects/:id/repository/branches/:branch" do
+ before { Repository.any_instance.stub(rm_branch: true) }
+
+ it "should remove branch" do
+ delete api("/projects/#{project.id}/repository/branches/new_design", user)
+ response.status.should == 200
+ end
+
+ it "should remove protected branch" do
+ project.protected_branches.create(name: 'new_design')
+ delete api("/projects/#{project.id}/repository/branches/new_design", user)
+ response.status.should == 405
+ json_response['message'].should == 'Protected branch cant be removed'
+ end
+
+ it "should not remove HEAD branch" do
+ delete api("/projects/#{project.id}/repository/branches/master", user)
+ response.status.should == 405
+ json_response['message'].should == 'Cannot remove HEAD branch'
+ end
+ end
end
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 3c7a4f58ab..9eb08ecdc5 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -149,7 +149,7 @@ describe API::API, api: true do
describe "POST /groups/:id/projects/:project_id" do
let(:project) { create(:project) }
before(:each) do
- project.stub(:transfer).and_return(true)
+ Projects::TransferService.any_instance.stub(execute: true)
Project.stub(:find).and_return(project)
end
@@ -162,8 +162,8 @@ describe API::API, api: true do
context "when authenticated as admin" do
it "should transfer project to group" do
- project.should_receive(:transfer)
post api("/groups/#{group1.id}/projects/#{project.id}", admin)
+ response.status.should == 201
end
end
end
diff --git a/spec/requests/api/notes_spec.rb b/spec/requests/api/notes_spec.rb
index 81576f7c23..2875db04ee 100644
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
@@ -13,58 +13,8 @@ describe API::API, api: true do
let!(:issue_note) { create(:note, noteable: issue, project: project, author: user) }
let!(:merge_request_note) { create(:note, noteable: merge_request, project: project, author: user) }
let!(:snippet_note) { create(:note, noteable: snippet, project: project, author: user) }
- let!(:wall_note) { create(:note, project: project, author: user) }
before { project.team << [user, :reporter] }
- describe "GET /projects/:id/notes" do
- context "when unauthenticated" do
- it "should return authentication error" do
- get api("/projects/#{project.id}/notes")
- response.status.should == 401
- end
- end
-
- context "when authenticated" do
- it "should return project wall notes" do
- get api("/projects/#{project.id}/notes", user)
- response.status.should == 200
- json_response.should be_an Array
- json_response.first['body'].should == wall_note.note
- end
- end
- end
-
- describe "GET /projects/:id/notes/:note_id" do
- it "should return a wall note by id" do
- get api("/projects/#{project.id}/notes/#{wall_note.id}", user)
- response.status.should == 200
- json_response['body'].should == wall_note.note
- end
-
- it "should return a 404 error if note not found" do
- get api("/projects/#{project.id}/notes/123", user)
- response.status.should == 404
- end
- end
-
- describe "POST /projects/:id/notes" do
- it "should create a new wall note" do
- post api("/projects/#{project.id}/notes", user), body: 'hi!'
- response.status.should == 201
- json_response['body'].should == 'hi!'
- end
-
- it "should return 401 unauthorized error" do
- post api("/projects/#{project.id}/notes")
- response.status.should == 401
- end
-
- it "should return a 400 bad request if body is missing" do
- post api("/projects/#{project.id}/notes", user)
- response.status.should == 400
- end
- end
-
describe "GET /projects/:id/noteable/:noteable_id/notes" do
context "when noteable is an Issue" do
it "should return an array of issue notes" do
@@ -143,7 +93,7 @@ describe API::API, api: true do
post api("/projects/#{project.id}/issues/#{issue.id}/notes", user), body: 'hi!'
response.status.should == 201
json_response['body'].should == 'hi!'
- json_response['author']['email'].should == user.email
+ json_response['author']['username'].should == user.username
end
it "should return a 400 bad request error if body not given" do
@@ -162,7 +112,7 @@ describe API::API, api: true do
post api("/projects/#{project.id}/snippets/#{snippet.id}/notes", user), body: 'hi!'
response.status.should == 201
json_response['body'].should == 'hi!'
- json_response['author']['email'].should == user.email
+ json_response['author']['username'].should == user.username
end
it "should return a 400 bad request error if body not given" do
diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb
index ec2d6e8509..032f850010 100644
--- a/spec/requests/api/project_members_spec.rb
+++ b/spec/requests/api/project_members_spec.rb
@@ -21,7 +21,7 @@ describe API::API, api: true do
response.status.should == 200
json_response.should be_an Array
json_response.count.should == 2
- json_response.map { |u| u['email'] }.should include user.email
+ json_response.map { |u| u['username'] }.should include user.username
end
it "finds team members with query string" do
@@ -29,7 +29,7 @@ describe API::API, api: true do
response.status.should == 200
json_response.should be_an Array
json_response.count.should == 1
- json_response.first['email'].should == user.email
+ json_response.first['username'].should == user.username
end
it "should return a 404 error if id not found" do
@@ -44,7 +44,7 @@ describe API::API, api: true do
it "should return project team member" do
get api("/projects/#{project.id}/members/#{user.id}", user)
response.status.should == 200
- json_response['email'].should == user.email
+ json_response['username'].should == user.username
json_response['access_level'].should == UsersProject::MASTER
end
@@ -62,7 +62,7 @@ describe API::API, api: true do
}.to change { UsersProject.count }.by(1)
response.status.should == 201
- json_response['email'].should == user2.email
+ json_response['username'].should == user2.username
json_response['access_level'].should == UsersProject::DEVELOPER
end
@@ -75,7 +75,7 @@ describe API::API, api: true do
}.not_to change { UsersProject.count }.by(1)
response.status.should == 201
- json_response['email'].should == user2.email
+ json_response['username'].should == user2.username
json_response['access_level'].should == UsersProject::DEVELOPER
end
@@ -101,7 +101,7 @@ describe API::API, api: true do
it "should update project team member" do
put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: UsersProject::MASTER
response.status.should == 200
- json_response['email'].should == user3.email
+ json_response['username'].should == user3.username
json_response['access_level'].should == UsersProject::MASTER
end
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index 06b2272692..363d90a282 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -37,7 +37,7 @@ describe API::API, api: true do
response.status.should == 200
json_response.should be_an Array
json_response.first['name'].should == project.name
- json_response.first['owner']['email'].should == user.email
+ json_response.first['owner']['username'].should == user.username
end
end
end
@@ -65,7 +65,7 @@ describe API::API, api: true do
response.status.should == 200
json_response.should be_an Array
json_response.first['name'].should == project.name
- json_response.first['owner']['email'].should == user.email
+ json_response.first['owner']['username'].should == user.username
end
end
end
@@ -126,7 +126,6 @@ describe API::API, api: true do
project = attributes_for(:project, {
description: Faker::Lorem.sentence,
issues_enabled: false,
- wall_enabled: false,
merge_requests_enabled: false,
wiki_enabled: false
})
@@ -208,7 +207,6 @@ describe API::API, api: true do
project = attributes_for(:project, {
description: Faker::Lorem.sentence,
issues_enabled: false,
- wall_enabled: false,
merge_requests_enabled: false,
wiki_enabled: false
})
@@ -272,7 +270,7 @@ describe API::API, api: true do
get api("/projects/#{project.id}", user)
response.status.should == 200
json_response['name'].should == project.name
- json_response['owner']['email'].should == user.email
+ json_response['owner']['username'].should == user.username
end
it "should return a project by path name" do
diff --git a/spec/requests/api/repositories_spec.rb b/spec/requests/api/repositories_spec.rb
index 5a5222ed3c..5afb3bddcb 100644
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
@@ -23,6 +23,24 @@ describe API::API, api: true do
end
end
+ describe 'POST /projects/:id/repository/tags' do
+ it 'should create a new tag' do
+ post api("/projects/#{project.id}/repository/tags", user),
+ tag_name: 'v1.0.0',
+ ref: 'master'
+
+ response.status.should == 201
+ json_response['name'].should == 'v1.0.0'
+ end
+ it 'should deny for user without push access' do
+ post api("/projects/#{project.id}/repository/tags", user2),
+ tag_name: 'v1.0.0',
+ ref: '621491c677087aa243f165eab467bfdfbee00be1'
+
+ response.status.should == 403
+ end
+ end
+
describe "GET /projects/:id/repository/tree" do
context "authorized user" do
before { project.team << [user2, :reporter] }
@@ -112,4 +130,43 @@ describe API::API, api: true do
response.status.should == 404
end
end
+
+ describe 'GET /GET /projects/:id/repository/compare' do
+ it "should compare branches" do
+ get api("/projects/#{project.id}/repository/compare", user), from: 'master', to: 'simple_merge_request'
+ response.status.should == 200
+ json_response['commits'].should be_present
+ json_response['diffs'].should be_present
+ end
+
+ it "should compare tags" do
+ get api("/projects/#{project.id}/repository/compare", user), from: 'v1.0.1', to: 'v1.0.2'
+ response.status.should == 200
+ json_response['commits'].should be_present
+ json_response['diffs'].should be_present
+ end
+
+ it "should compare commits" do
+ get api("/projects/#{project.id}/repository/compare", user), from: 'b1e6a9dbf1c85', to: '1e689bfba395'
+ response.status.should == 200
+ json_response['commits'].should be_empty
+ json_response['diffs'].should be_empty
+ json_response['compare_same_ref'].should be_false
+ end
+
+ it "should compare commits in reverse order" do
+ get api("/projects/#{project.id}/repository/compare", user), from: '1e689bfba395', to: 'b1e6a9dbf1c85'
+ response.status.should == 200
+ json_response['commits'].should be_present
+ json_response['diffs'].should be_present
+ end
+
+ it "should compare same refs" do
+ get api("/projects/#{project.id}/repository/compare", user), from: 'master', to: 'master'
+ response.status.should == 200
+ json_response['commits'].should be_empty
+ json_response['diffs'].should be_empty
+ json_response['compare_same_ref'].should be_true
+ end
+ end
end
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index a6d300b099..c3eec56d13 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -20,7 +20,18 @@ describe API::API, api: true do
get api("/users", user)
response.status.should == 200
json_response.should be_an Array
- json_response.first['email'].should == user.email
+ json_response.first['username'].should == user.username
+ end
+ end
+
+ context "when admin" do
+ it "should return an array of users" do
+ get api("/users", admin)
+ response.status.should == 200
+ json_response.should be_an Array
+ json_response.first.keys.should include 'email'
+ json_response.first.keys.should include 'extern_uid'
+ json_response.first.keys.should include 'can_create_project'
end
end
end
@@ -29,7 +40,7 @@ describe API::API, api: true do
it "should return a user by id" do
get api("/users/#{user.id}", user)
response.status.should == 200
- json_response['email'].should == user.email
+ json_response['username'].should == user.username
end
it "should return a 401 if unauthenticated" do
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index fa9762625d..4b2eb42c70 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -56,7 +56,6 @@ end
# projects POST /projects(.:format) projects#create
# new_project GET /projects/new(.:format) projects#new
# fork_project POST /:id/fork(.:format) projects#fork
-# wall_project GET /:id/wall(.:format) projects#wall
# files_project GET /:id/files(.:format) projects#files
# edit_project GET /:id/edit(.:format) projects#edit
# project GET /:id(.:format) projects#show
@@ -75,10 +74,6 @@ describe ProjectsController, "routing" do
post("/gitlab/gitlabhq/fork").should route_to('projects#fork', id: 'gitlab/gitlabhq')
end
- it "to #wall" do
- get("/gitlab/gitlabhq/wall").should route_to('projects/walls#show', project_id: 'gitlab/gitlabhq')
- end
-
it "to #edit" do
get("/gitlab/gitlabhq/edit").should route_to('projects#edit', id: 'gitlab/gitlabhq')
end
diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index a2d2a35140..1e92cf62dd 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -79,35 +79,35 @@ describe HelpController, "routing" do
end
it "to #permissions" do
- get("/help/permissions").should route_to('help#permissions')
+ get("/help/permissions/permissions").should route_to('help#show', category: "permissions", file: "permissions")
end
it "to #workflow" do
- get("/help/workflow").should route_to('help#workflow')
+ get("/help/workflow/README").should route_to('help#show', category: "workflow", file: "README")
end
it "to #api" do
- get("/help/api").should route_to('help#api')
+ get("/help/api/README").should route_to('help#show', category: "api", file: "README")
end
it "to #web_hooks" do
- get("/help/web_hooks").should route_to('help#web_hooks')
+ get("/help/web_hooks/web_hooks").should route_to('help#show', category: "web_hooks", file: "web_hooks")
end
it "to #system_hooks" do
- get("/help/system_hooks").should route_to('help#system_hooks')
+ get("/help/system_hooks/system_hooks").should route_to('help#show', category: "system_hooks", file: "system_hooks")
end
it "to #markdown" do
- get("/help/markdown").should route_to('help#markdown')
+ get("/help/markdown/markdown").should route_to('help#show',category: "markdown", file: "markdown")
end
it "to #ssh" do
- get("/help/ssh").should route_to('help#ssh')
+ get("/help/ssh/README").should route_to('help#show', category: "ssh", file: "README")
end
it "to #raketasks" do
- get("/help/raketasks").should route_to('help#raketasks')
+ get("/help/raketasks/README").should route_to('help#show', category: "raketasks", file: "README")
end
end
@@ -245,7 +245,7 @@ describe "Groups", "routing" do
end
it "also display group#show on the short path" do
- get("/1").should route_to('groups#show', id: '1')
+ get('/1').should route_to('namespaces#show', id: '1')
end
end
diff --git a/spec/services/issues/close_service_spec.rb b/spec/services/issues/close_service_spec.rb
index d4f2cc1339..7324650d53 100644
--- a/spec/services/issues/close_service_spec.rb
+++ b/spec/services/issues/close_service_spec.rb
@@ -22,7 +22,7 @@ describe Issues::CloseService do
it 'should send email to user2 about assign of new issue' do
email = ActionMailer::Base.deliveries.last
- email.to.first.should == user2.email
+ email.cc.first.should == user2.email
email.subject.should include(issue.title)
end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 347560414e..47d1856503 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -31,7 +31,7 @@ describe Issues::UpdateService do
it 'should send email to user2 about assign of new issue' do
email = ActionMailer::Base.deliveries.last
- email.to.first.should == user2.email
+ email.cc.first.should == user2.email
email.subject.should include(issue.title)
end
diff --git a/spec/services/merge_requests/close_service_spec.rb b/spec/services/merge_requests/close_service_spec.rb
index a504f916b0..2c5a7c4f26 100644
--- a/spec/services/merge_requests/close_service_spec.rb
+++ b/spec/services/merge_requests/close_service_spec.rb
@@ -22,7 +22,7 @@ describe MergeRequests::CloseService do
it 'should send email to user2 about assign of new merge_request' do
email = ActionMailer::Base.deliveries.last
- email.to.first.should == user2.email
+ email.cc.first.should == user2.email
email.subject.should include(merge_request.title)
end
diff --git a/spec/services/merge_requests/update_service_spec.rb b/spec/services/merge_requests/update_service_spec.rb
index af5d3a3dc8..42ac05862b 100644
--- a/spec/services/merge_requests/update_service_spec.rb
+++ b/spec/services/merge_requests/update_service_spec.rb
@@ -31,7 +31,7 @@ describe MergeRequests::UpdateService do
it 'should send email to user2 about assign of new merge_request' do
email = ActionMailer::Base.deliveries.last
- email.to.first.should == user2.email
+ email.cc.first.should == user2.email
email.subject.should include(merge_request.title)
end
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index 38aae452c3..0eac6bed74 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -65,7 +65,6 @@ describe Projects::CreateService do
@settings.stub(:issues) { true }
@settings.stub(:merge_requests) { true }
@settings.stub(:wiki) { true }
- @settings.stub(:wall) { true }
@settings.stub(:snippets) { true }
stub_const("Settings", Class.new)
@restrictions = double("restrictions")
@@ -108,7 +107,6 @@ describe Projects::CreateService do
@settings.stub(:issues) { true }
@settings.stub(:merge_requests) { true }
@settings.stub(:wiki) { true }
- @settings.stub(:wall) { true }
@settings.stub(:snippets) { true }
@settings.stub(:visibility_level) { Gitlab::VisibilityLevel::PRIVATE }
stub_const("Settings", Class.new)
diff --git a/spec/services/projects/image_service_spec.rb b/spec/services/projects/image_service_spec.rb
new file mode 100644
index 0000000000..070c21698c
--- /dev/null
+++ b/spec/services/projects/image_service_spec.rb
@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Projects::ImageService do
+ before(:each) { enable_observers }
+ after(:each) { disable_observers }
+
+ describe 'Image service' do
+ before do
+ @user = create :user
+ @project = create :project, creator_id: @user.id, namespace: @user.namespace
+ end
+
+ context 'for valid gif file' do
+ before do
+ gif = fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif')
+ @link_to_image = upload_image(@project.repository, { 'markdown_img' => gif }, "http://test.example/")
+ end
+
+ it { expect(@link_to_image).to have_key("alt") }
+ it { expect(@link_to_image).to have_key("url") }
+ it { expect(@link_to_image).to have_value("banana_sample") }
+ it { expect(@link_to_image["url"]).to match("http://test.example/uploads/#{@project.path_with_namespace}") }
+ it { expect(@link_to_image["url"]).to match("banana_sample.gif") }
+ end
+
+ context 'for valid png file' do
+ before do
+ png = fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/png')
+ @link_to_image = upload_image(@project.repository, { 'markdown_img' => png }, "http://test.example/")
+ end
+
+ it { expect(@link_to_image).to have_key("alt") }
+ it { expect(@link_to_image).to have_key("url") }
+ it { expect(@link_to_image).to have_value("dk") }
+ it { expect(@link_to_image["url"]).to match("http://test.example/uploads/#{@project.path_with_namespace}") }
+ it { expect(@link_to_image["url"]).to match("dk.png") }
+ end
+
+ context 'for valid jpg file' do
+ before do
+ jpg = fixture_file_upload(Rails.root + 'spec/fixtures/rails_sample.jpg', 'image/jpg')
+ @link_to_image = upload_image(@project.repository, { 'markdown_img' => jpg }, "http://test.example/")
+ end
+
+ it { expect(@link_to_image).to have_key("alt") }
+ it { expect(@link_to_image).to have_key("url") }
+ it { expect(@link_to_image).to have_value("rails_sample") }
+ it { expect(@link_to_image["url"]).to match("http://test.example/uploads/#{@project.path_with_namespace}") }
+ it { expect(@link_to_image["url"]).to match("rails_sample.jpg") }
+ end
+
+ context 'for txt file' do
+ before do
+ txt = fixture_file_upload(Rails.root + 'spec/fixtures/doc_sample.txt', 'text/plain')
+ @link_to_image = upload_image(@project.repository, { 'markdown_img' => txt }, "http://test.example/")
+ end
+
+ it { expect(@link_to_image).to be_nil }
+ end
+ end
+
+ def upload_image(repository, params, root_url)
+ Projects::ImageService.new(repository, params, root_url).execute
+ end
+end
diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb
index 109b429967..563a8b0c01 100644
--- a/spec/services/projects/transfer_service_spec.rb
+++ b/spec/services/projects/transfer_service_spec.rb
@@ -1,16 +1,20 @@
require 'spec_helper'
-describe ProjectTransferService do
+describe Projects::TransferService do
before(:each) { enable_observers }
after(:each) {disable_observers}
- context 'namespace -> namespace' do
- let(:user) { create(:user) }
- let(:group) { create(:group) }
- let(:project) { create(:project, namespace: user.namespace) }
+ let(:user) { create(:user) }
+ let(:group) { create(:group) }
+ let(:group2) { create(:group) }
+ let(:project) { create(:project, namespace: user.namespace) }
+ context 'namespace -> namespace' do
before do
- @result = service.transfer(project, group)
+ group.add_owner(user)
+ @service = Projects::TransferService.new(project, user, namespace_id: group.id)
+ @service.gitlab_shell.stub(mv_repository: true)
+ @result = @service.execute
end
it { @result.should be_true }
@@ -18,16 +22,25 @@ describe ProjectTransferService do
end
context 'namespace -> no namespace' do
- let(:user) { create(:user) }
- let(:project) { create(:project, namespace: user.namespace) }
+ before do
+ group.add_owner(user)
+ @service = Projects::TransferService.new(project, user, namespace_id: nil)
+ @service.gitlab_shell.stub(mv_repository: true)
+ @result = @service.execute
+ end
- it { lambda{service.transfer(project, nil)}.should raise_error(ActiveRecord::RecordInvalid) }
+ it { @result.should be_false }
+ it { project.namespace.should == user.namespace }
end
- def service
- service = ProjectTransferService.new
- service.gitlab_shell.stub(mv_repository: true)
- service
+ context 'namespace -> not allowed namespace' do
+ before do
+ @service = Projects::TransferService.new(project, user, namespace_id: group2.id)
+ @service.gitlab_shell.stub(mv_repository: true)
+ @result = @service.execute
+ end
+
+ it { @result.should be_false }
+ it { project.namespace.should == user.namespace }
end
end
-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e6b1f816df..65a641bcf1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,6 +27,8 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
WebMock.disable_net_connect!(allow_localhost: true)
RSpec.configure do |config|
+ config.use_transactional_fixtures = false
+ config.use_instantiated_fixtures = false
config.mock_with :rspec
config.include LoginHelpers, type: :feature
@@ -39,7 +41,6 @@ RSpec.configure do |config|
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
# instead of true.
- config.use_transactional_fixtures = false
config.before(:suite) do
TestEnv.init(observers: false, init_repos: true, repos: false)
diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index 8c9c74f14b..d2d532d973 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -1,22 +1,39 @@
-require 'database_cleaner'
+# RSpec.configure do |config|
+# config.around(:each) do |example|
+# DatabaseCleaner.strategy = :transaction
+# DatabaseCleaner.clean_with(:truncation)
+# DatabaseCleaner.cleaning do
+# example.run
+# end
+# end
+
+# config.around(:each, js: true) do |example|
+# DatabaseCleaner.strategy = :truncation
+# DatabaseCleaner.clean_with(:truncation)
+# DatabaseCleaner.cleaning do
+# example.run
+# end
+# end
+# end
RSpec.configure do |config|
- config.before do
- if example.metadata[:js]
- DatabaseCleaner.strategy = :truncation
- Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true
- else
- DatabaseCleaner.strategy = :transaction
- end
-
- unless example.metadata[:no_db]
- DatabaseCleaner.start
- end
+ config.before(:suite) do
+ DatabaseCleaner.clean_with(:truncation)
end
- config.after do
- unless example.metadata[:no_db]
- DatabaseCleaner.clean
- end
+ config.before(:each) do
+ DatabaseCleaner.strategy = :transaction
+ end
+
+ config.before(:each, :js => true) do
+ DatabaseCleaner.strategy = :truncation
+ end
+
+ config.before(:each) do
+ DatabaseCleaner.start
+ end
+
+ config.after(:each) do
+ DatabaseCleaner.clean
end
end
diff --git a/vendor/assets/javascripts/jquery.scrollto.js b/vendor/assets/javascripts/jquery.scrollto.js
deleted file mode 100644
index 7f10b7f108..0000000000
--- a/vendor/assets/javascripts/jquery.scrollto.js
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * @depends jquery
- * @name jquery.scrollto
- * @package jquery-scrollto {@link http://balupton.com/projects/jquery-scrollto}
- */
-
-/**
- * jQuery Aliaser
- */
-(function(window,undefined){
- // Prepare
- var jQuery, $, ScrollTo;
- jQuery = $ = window.jQuery;
-
- /**
- * jQuery ScrollTo (balupton edition)
- * @version 1.2.0
- * @date July 9, 2012
- * @since 0.1.0, August 27, 2010
- * @package jquery-scrollto {@link http://balupton.com/projects/jquery-scrollto}
- * @author Benjamin "balupton" Lupton {@link http://balupton.com}
- * @copyright (c) 2010 Benjamin Arthur Lupton {@link http://balupton.com}
- * @license MIT License {@link http://creativecommons.org/licenses/MIT/}
- */
- ScrollTo = $.ScrollTo = $.ScrollTo || {
- /**
- * The Default Configuration
- */
- config: {
- duration: 400,
- easing: 'swing',
- callback: undefined,
- durationMode: 'each',
- offsetTop: 0,
- offsetLeft: 0
- },
-
- /**
- * Configure ScrollTo
- */
- configure: function(options){
- // Apply Options to Config
- $.extend(ScrollTo.config, options||{});
-
- // Chain
- return this;
- },
-
- /**
- * Perform the Scroll Animation for the Collections
- * We use $inline here, so we can determine the actual offset start for each overflow:scroll item
- * Each collection is for each overflow:scroll item
- */
- scroll: function(collections, config){
- // Prepare
- var collection, $container, container, $target, $inline, position,
- containerScrollTop, containerScrollLeft,
- containerScrollTopEnd, containerScrollLeftEnd,
- startOffsetTop, targetOffsetTop, targetOffsetTopAdjusted,
- startOffsetLeft, targetOffsetLeft, targetOffsetLeftAdjusted,
- scrollOptions,
- callback;
-
- // Determine the Scroll
- collection = collections.pop();
- $container = collection.$container;
- container = $container.get(0);
- $target = collection.$target;
-
- // Prepare the Inline Element of the Container
- $inline = $('