Commit 5093c800 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

parents f2abc372 cfde0936
......@@ -24,6 +24,7 @@ v 7.1.0
- Increased default git max_size value from 5MB to 20MB in gitlab.yml. Please update your configs!
- Show error message in case of timeout in satellite when create MR
- Show first 100 files for huge diff instead of hiding all
- Change default admin email from admin@local.host to admin@example.com
v 7.0.0
- The CPU no longer overheats when you hold down the spacebar
......
......@@ -179,7 +179,7 @@ $(document).ready ->
$(".markdown-selector").click (e) ->
e.preventDefault()
$(".div-dropzone").click()
$(@).closest(".div-dropzone-wrapper").find(".div-dropzone").click()
return
return
......@@ -472,7 +472,7 @@ class User < ActiveRecord::Base
def avatar_url(size = nil)
if avatar.present?
URI::join(gitlab_config.url, avatar.url).to_s
[gitlab_config.url, avatar.url].join("/")
else
GravatarService.new.execute(email, size)
end
......
......@@ -2,7 +2,7 @@ User.seed(:id, [
{
id: 1,
name: "Administrator",
email: "admin@local.host",
email: "admin@example.com",
username: 'root',
password: "5iveL!fe",
password_confirmation: "5iveL!fe",
......
admin = User.create(
email: "admin@local.host",
email: "admin@example.com",
name: "Administrator",
username: 'root',
password: "5iveL!fe",
......@@ -18,7 +18,7 @@ if admin.valid?
puts %q[
Administrator account created:
login.........admin@local.host
login.........root
password......5iveL!fe
]
end
......@@ -30,7 +30,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -38,7 +38,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -74,7 +74,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -82,7 +82,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -120,7 +120,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -128,7 +128,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -167,7 +167,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -175,7 +175,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -218,7 +218,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -226,7 +226,7 @@ Parameters:
"assignee": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2012-04-29T08:46:00Z"
......@@ -253,7 +253,7 @@ Parameters:
"author": {
"id": 1,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"blocked": false,
"created_at": "2012-04-29T08:46:00Z"
......@@ -282,7 +282,7 @@ Parameters:
"author": {
"id": 11,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2014-03-06T08:17:35.000Z"
......@@ -293,7 +293,7 @@ Parameters:
"author": {
"id": 11,
"username": "admin",
"email": "admin@local.host",
"email": "admin@example.com",
"name": "Administrator",
"state": "active",
"created_at": "2014-03-06T08:17:35.000Z"
......
......@@ -21,6 +21,10 @@ Any changes not yet added to the changelog are added by lead developer and in th
* Update the changelog (#LINK)
16th:
* Merge CE in to EE (#LINK)
17th:
* Create x.x.0.rc1 (#LINK)
......@@ -48,22 +52,22 @@ Any changes not yet added to the changelog are added by lead developer and in th
* Deploy to GitLab.com (#LINK)
```
# **17th - Create RC1**
# **16th - Merge the CE into EE**
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.
Do this via a merge request.
### **1. Merge the CE code into EE**
# **17th - Create RC1**
Do this via a merge request.
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.
### **2. Update the installation guide**
### **1. Update the installation guide**
1. Check if it references the correct branch `x-x-stable` (doesn't exist yet, but that is okay)
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 guides**
### **2. Create an update guides**
1. Create: CE update guide from previous version. Like `from-6-8-to-6.9`
1. Create: CE to EE update guide in EE repository for latest version.
......@@ -115,7 +119,7 @@ Check if the `init.d/gitlab` script changed since last release: <https://gitlab.
#### 10. Check application status
### **4. Code quality indicators**
### **3. Code quality indicators**
Make sure the code quality indicators are green / good.
......@@ -129,11 +133,11 @@ Make sure the code quality indicators are green / good.
- [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)
### **5. Set VERSION**
### **4. Set VERSION**
Change version in VERSION to `x.x.0.rc1`.
### **6. Tag**
### **5. Tag**
Create an annotated tag that points to the version change commit:
......@@ -145,7 +149,9 @@ git tag -a vx.x.0.rc1 -m 'Version x.x.0.rc1'
### **1. Update GitLab.com**
Merge the RC1 code into GitLab.com. Once the build is green, deploy in the morning.
Merge the RC1 EE code into GitLab.com.
Once the build is green, create a package.
Try to 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.
### **2. Prepare the blog post**
......@@ -171,9 +177,9 @@ Assign the issue to the release manager and /cc all the core-team members active
Tweet about the RC release:
> GitLab x.x.0.rc1 is out. This release candidate is only suitable for testing. Please create issues for regressions and add a link from LINK_TO_ISSUE.
> GitLab x.x.0.rc1 is out. This release candidate is only suitable for testing. Please link regressions issues from LINK_TO_REGRESSION_ISSUE
# **21st - Preparation **
# **21st - Preparation**
### **1. Q&A**
......
Markdown is supported
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