Skip to content
Snippets Groups Projects
Commit 4f3f3ed5 authored by Michael Elliott's avatar Michael Elliott
Browse files

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce

parents 401e1091 92772f85
No related branches found
No related tags found
1 merge request!5170Fix Issue 19641 (new snippets style bug)
Hide whitespace changes
Inline Side-by-side
app/assets/stylesheets/framework/nav.scss
+ 2
− 2
View file @ 4f3f3ed5
@@ -77,10 +77,10 @@
@@ -77,10 +77,10 @@
   
&.sub-nav { &.sub-nav {
text-align: center; text-align: center;
background-color: $background-color; background-color: $dark-background-color;
   
.container-fluid { .container-fluid {
background-color: $background-color; background-color: $dark-background-color;
margin-bottom: 0; margin-bottom: 0;
} }
   
app/assets/stylesheets/framework/variables.scss
+ 5
− 7
View file @ 4f3f3ed5
@@ -12,10 +12,11 @@ $sidebar-breakpoint: 1024px;
@@ -12,10 +12,11 @@ $sidebar-breakpoint: 1024px;
/* /*
* UI elements * UI elements
*/ */
$border-color: #e5e5e5; $border-color: #e5e5e5;
$focus-border-color: #3aabf0; $focus-border-color: #3aabf0;
$table-border-color: #f0f0f0; $table-border-color: #f0f0f0;
$background-color: #fafafa; $background-color: #fafafa;
$dark-background-color: #f7f7f7;
   
/* /*
* Text * Text
@@ -153,9 +154,6 @@ $warning-message-bg: #fbf2d9;
@@ -153,9 +154,6 @@ $warning-message-bg: #fbf2d9;
$warning-message-color: #9e8e60; $warning-message-color: #9e8e60;
$warning-message-border: #f0e2bb; $warning-message-border: #f0e2bb;
   
/* header */
$light-grey-header: #faf9f9;
/* tanuki logo colors */ /* tanuki logo colors */
$tanuki-red: #e24329; $tanuki-red: #e24329;
$tanuki-orange: #fc6d26; $tanuki-orange: #fc6d26;
doc/administration/custom_hooks.md
+ 2
− 1
View file @ 4f3f3ed5
@@ -48,7 +48,8 @@ as appropriate.
@@ -48,7 +48,8 @@ as appropriate.
This feature was [introduced][5073] in GitLab 8.10. This feature was [introduced][5073] in GitLab 8.10.
   
If the commit is declined or an error occurs during the Git hook check, If the commit is declined or an error occurs during the Git hook check,
the STDERR and/or SDOUT message of the hook will be present in GitLab's UI. the STDERR or STDOUT message of the hook will be present in GitLab's UI.
STDERR takes precedence over STDOUT.
   
![Custom message from custom Git hook](img/custom_hooks_error_msg.png) ![Custom message from custom Git hook](img/custom_hooks_error_msg.png)
   
doc/api/merge_requests.md
+ 9
− 9
View file @ 4f3f3ed5
@@ -49,10 +49,10 @@ Parameters:
@@ -49,10 +49,10 @@ Parameters:
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "created_at": "2012-04-29T08:46:00Z"
}, },
"source_project_id": "2", "source_project_id": 2,
"target_project_id": "3", "target_project_id": 3,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
@@ -113,10 +113,10 @@ Parameters:
@@ -113,10 +113,10 @@ Parameters:
"state": "active", "state": "active",
"created_at": "2012-04-29T08:46:00Z" "created_at": "2012-04-29T08:46:00Z"
}, },
"source_project_id": "2", "source_project_id": 2,
"target_project_id": "3", "target_project_id": 3,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
@@ -296,7 +296,7 @@ Parameters:
@@ -296,7 +296,7 @@ Parameters:
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
@@ -465,7 +465,7 @@ Parameters:
@@ -465,7 +465,7 @@ Parameters:
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
@@ -531,7 +531,7 @@ Parameters:
@@ -531,7 +531,7 @@ Parameters:
"source_project_id": 4, "source_project_id": 4,
"target_project_id": 4, "target_project_id": 4,
"labels": [ ], "labels": [ ],
"description":"fixed login page css paddings", "description": "fixed login page css paddings",
"work_in_progress": false, "work_in_progress": false,
"milestone": { "milestone": {
"id": 5, "id": 5,
doc/api/projects.md
+ 42
− 35
View file @ 4f3f3ed5
@@ -52,7 +52,7 @@ Parameters:
@@ -52,7 +52,7 @@ Parameters:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Client", "name": "Diaspora Client",
"name_with_namespace": "Diaspora / Diaspora Client", "name_with_namespace": "Diaspora / Diaspora Client",
@@ -64,17 +64,18 @@ Parameters:
@@ -64,17 +64,18 @@ Parameters:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"archived": false, "archived": false,
"avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png", "avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png",
@@ -113,6 +114,7 @@ Parameters:
@@ -113,6 +114,7 @@ Parameters:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"container_registry_enabled": false,
"created_at": "2013-09-30T13:46:02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z", "last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
@@ -225,7 +227,7 @@ Parameters:
@@ -225,7 +227,7 @@ Parameters:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Project Site", "name": "Diaspora Project Site",
"name_with_namespace": "Diaspora / Diaspora Project Site", "name_with_namespace": "Diaspora / Diaspora Project Site",
@@ -237,17 +239,18 @@ Parameters:
@@ -237,17 +239,18 @@ Parameters:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"permissions": { "permissions": {
"project_access": { "project_access": {
@@ -555,17 +558,18 @@ Example response:
@@ -555,17 +558,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"archived": true, "archived": true,
"avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
@@ -620,17 +624,18 @@ Example response:
@@ -620,17 +624,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"archived": true, "archived": true,
"avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png", "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
@@ -682,7 +687,7 @@ Example response:
@@ -682,7 +687,7 @@ Example response:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Project Site", "name": "Diaspora Project Site",
"name_with_namespace": "Diaspora / Diaspora Project Site", "name_with_namespace": "Diaspora / Diaspora Project Site",
@@ -694,17 +699,18 @@ Example response:
@@ -694,17 +699,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"permissions": { "permissions": {
"project_access": { "project_access": {
@@ -767,7 +773,7 @@ Example response:
@@ -767,7 +773,7 @@ Example response:
"owner": { "owner": {
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"created_at": "2013-09-30T13: 46: 02Z" "created_at": "2013-09-30T13:46:02Z"
}, },
"name": "Diaspora Project Site", "name": "Diaspora Project Site",
"name_with_namespace": "Diaspora / Diaspora Project Site", "name_with_namespace": "Diaspora / Diaspora Project Site",
@@ -779,17 +785,18 @@ Example response:
@@ -779,17 +785,18 @@ Example response:
"builds_enabled": true, "builds_enabled": true,
"wiki_enabled": true, "wiki_enabled": true,
"snippets_enabled": false, "snippets_enabled": false,
"created_at": "2013-09-30T13: 46: 02Z", "container_registry_enabled": false,
"last_activity_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"last_activity_at": "2013-09-30T13:46:02Z",
"creator_id": 3, "creator_id": 3,
"namespace": { "namespace": {
"created_at": "2013-09-30T13: 46: 02Z", "created_at": "2013-09-30T13:46:02Z",
"description": "", "description": "",
"id": 3, "id": 3,
"name": "Diaspora", "name": "Diaspora",
"owner_id": 1, "owner_id": 1,
"path": "diaspora", "path": "diaspora",
"updated_at": "2013-09-30T13: 46: 02Z" "updated_at": "2013-09-30T13:46:02Z"
}, },
"permissions": { "permissions": {
"project_access": { "project_access": {
@@ -991,11 +998,11 @@ Parameters:
@@ -991,11 +998,11 @@ Parameters:
"id": 1, "id": 1,
"url": "http://example.com/hook", "url": "http://example.com/hook",
"project_id": 3, "project_id": 3,
"push_events": "true", "push_events": true,
"issues_events": "true", "issues_events": true,
"merge_requests_events": "true", "merge_requests_events": true,
"note_events": "true", "note_events": true,
"enable_ssl_verification": "true", "enable_ssl_verification": true,
"created_at": "2012-10-12T17:04:47Z" "created_at": "2012-10-12T17:04:47Z"
} }
``` ```
@@ -1115,8 +1122,8 @@ Parameters:
@@ -1115,8 +1122,8 @@ Parameters:
"name": "Jeremy Ashkenas", "name": "Jeremy Ashkenas",
"email": "jashkenas@example.com" "email": "jashkenas@example.com"
}, },
"authored_date": "2013-09-07T12: 58: 21+00: 00", "authored_date": "2013-09-07T12:58:21+00:00",
"committed_date": "2013-09-07T12: 58: 21+00: 00" "committed_date": "2013-09-07T12:58:21+00:00"
}, },
"protected": false "protected": false
} }
doc/ci/examples/php.md
+ 1
− 1
View file @ 4f3f3ed5
@@ -49,7 +49,7 @@ apt-get update -yqq
@@ -49,7 +49,7 @@ apt-get update -yqq
apt-get install git -yqq apt-get install git -yqq
   
# Install phpunit, the tool that we will use for testing # Install phpunit, the tool that we will use for testing
curl -o /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar
chmod +x /usr/local/bin/phpunit chmod +x /usr/local/bin/phpunit
   
# Install mysql driver # Install mysql driver
doc/development/ui_guide.md
+ 2
− 1
View file @ 4f3f3ed5
@@ -52,5 +52,6 @@ information from database or file system
@@ -52,5 +52,6 @@ information from database or file system
* Use red button for destructive actions (not revertable). For example removing issue. * Use red button for destructive actions (not revertable). For example removing issue.
* Use green or blue button for primary action. Primary button should be only one. * Use green or blue button for primary action. Primary button should be only one.
Do not use both green and blue button in one form. Do not use both green and blue button in one form.
* For all other cases use default white button * For all other cases use default white button.
* Text button should have only first word capitalized. So should be "Create issue" instead of "Create Issue"
   
doc/update/8.9-to-8.10.md
+ 1
− 1
View file @ 4f3f3ed5
@@ -46,7 +46,7 @@ sudo -u git -H git checkout 8-10-stable-ee
@@ -46,7 +46,7 @@ sudo -u git -H git checkout 8-10-stable-ee
```bash ```bash
cd /home/git/gitlab-shell cd /home/git/gitlab-shell
sudo -u git -H git fetch --all --tags sudo -u git -H git fetch --all --tags
sudo -u git -H git checkout v3.1.0 sudo -u git -H git checkout v3.2.0
``` ```
   
### 5. Update gitlab-workhorse ### 5. Update gitlab-workhorse
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment