<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch update-custom-hooks-docs</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Update custom hooks docs and set 4.1.0</title>
<updated>2016-12-12T15:29:13+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-12-12T13:30:50+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=20a6183be6abe356c8e301c90536fa3252214127'/>
<id>20a6183be6abe356c8e301c90536fa3252214127</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '25324-change-housekeeping-btn-to-default' into 'master'</title>
<updated>2016-12-09T23:24:12+00:00</updated>
<author>
<name>Alfredo Sumaran</name>
<email>alfredo@gitlab.com</email>
</author>
<published>2016-12-09T23:24:12+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3f768f9a14ad90bbd79d384e3c287db4feea3e35'/>
<id>3f768f9a14ad90bbd79d384e3c287db4feea3e35</id>
<content type='text'>

Use default btn styling for Housekeeping button on projects settings page

Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default```

**BEFORE:** ![Screen_Shot_2016-12-06_at_12_51_42_PM](/uploads/1b1c8a26eead025062e2c98d9d0f4286/Screen_Shot_2016-12-06_at_12_51_42_PM.png)

**AFTER:** ![Screen_Shot_2016-12-06_at_12_51_57_PM](/uploads/9e7937af4a058fa1aa8b45653dbad3ee/Screen_Shot_2016-12-06_at_12_51_57_PM.png)

Closes #25324 
cc: @awhildy

See merge request !7959</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Use default btn styling for Housekeeping button on projects settings page

Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default```

**BEFORE:** ![Screen_Shot_2016-12-06_at_12_51_42_PM](/uploads/1b1c8a26eead025062e2c98d9d0f4286/Screen_Shot_2016-12-06_at_12_51_42_PM.png)

**AFTER:** ![Screen_Shot_2016-12-06_at_12_51_57_PM](/uploads/9e7937af4a058fa1aa8b45653dbad3ee/Screen_Shot_2016-12-06_at_12_51_57_PM.png)

Closes #25324 
cc: @awhildy

See merge request !7959</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'issue_24020' into 'master'</title>
<updated>2016-12-09T22:49:08+00:00</updated>
<author>
<name>Alfredo Sumaran</name>
<email>alfredo@gitlab.com</email>
</author>
<published>2016-12-09T22:49:08+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3a66c2398ac3ae85b4703b2edd9f9adf62494759'/>
<id>3a66c2398ac3ae85b4703b2edd9f9adf62494759</id>
<content type='text'>

fix display hook error message

## What does this MR do?

Fix hook error message display.  

## Are there points in the code the reviewer needs to double check?

Probably Hook will return the plain multi line text.  It is better `pre` tag than `h4`.  
I thought of another good looking display, but I did not come up with it. :sweat: 

## Why was this MR needed?

When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error.  

## Screenshots (if relevant)

When update hook returns an error like

```
XXXXXXXX

YYYYYYYY
ZZZZZZZZ
```

![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png)

## What are the relevant issue numbers?

Closes #24020

See merge request !7775</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

fix display hook error message

## What does this MR do?

Fix hook error message display.  

## Are there points in the code the reviewer needs to double check?

Probably Hook will return the plain multi line text.  It is better `pre` tag than `h4`.  
I thought of another good looking display, but I did not come up with it. :sweat: 

## Why was this MR needed?

When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error.  

## Screenshots (if relevant)

When update hook returns an error like

```
XXXXXXXX

YYYYYYYY
ZZZZZZZZ
```

![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png)

## What are the relevant issue numbers?

Closes #24020

See merge request !7775</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'remove-your_email-gsub-in-help-page' into 'master'</title>
<updated>2016-12-09T21:14:27+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-12-09T21:14:27+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4f365066330365391c11eeb408e884c021465a00'/>
<id>4f365066330365391c11eeb408e884c021465a00</id>
<content type='text'>

Stop replacing `$your_email` with the user's email in the `/help` pages

See merge request !8014</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Stop replacing `$your_email` with the user's email in the `/help` pages

See merge request !8014</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into 'master'</title>
<updated>2016-12-09T19:27:09+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-12-09T19:27:09+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ffa1b67d2fe2ca00616837e477002142e8f6dcfa'/>
<id>ffa1b67d2fe2ca00616837e477002142e8f6dcfa</id>
<content type='text'>

Remove 'Leave Project' and 'Leave Group' from settings dropdowns

## What does this MR do?

Removes `Leave Project` and `Leave Group` from the settings dropdown.

Adds it to the `views/shared/members/access_request_buttons.html.haml`.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png)
![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #23305

See merge request !7600</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Remove 'Leave Project' and 'Leave Group' from settings dropdowns

## What does this MR do?

Removes `Leave Project` and `Leave Group` from the settings dropdown.

Adds it to the `views/shared/members/access_request_buttons.html.haml`.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png)
![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #23305

See merge request !7600</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'workhorse-1.1.1' into 'master'</title>
<updated>2016-12-09T18:15:54+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-12-09T18:15:54+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6eae378d82634b3305b2e9e031eecf30834f1700'/>
<id>6eae378d82634b3305b2e9e031eecf30834f1700</id>
<content type='text'>

Use gitlab-workhose 1.1.1

Change CI API rate limiting behavior.

Will make a separate MR for 8-14-stable because that version lacks the workhorse install rake task.

See merge request !7990</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Use gitlab-workhose 1.1.1

Change CI API rate limiting behavior.

Will make a separate MR for 8-14-stable because that version lacks the workhorse install rake task.

See merge request !7990</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update-button-font-weight' into 'master'</title>
<updated>2016-12-09T18:13:04+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-12-09T18:13:04+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e837df80fbd296a3927644fc4e0521c99d2ea02c'/>
<id>e837df80fbd296a3927644fc4e0521c99d2ea02c</id>
<content type='text'>

Updates the font weight of button styles because of the change to system fonts

## What does this MR do?

Updates the font weight of button styles because of the change to system fonts

## Are there points in the code the reviewer needs to double check?
-

## Why was this MR needed?

Because of the change to system fonts the font weight for buttons needed to be toned down a bit.

Seems only buttons styles were affected.

## Screenshots (if relevant)

left = result

![image](/uploads/c75868dca76561cafd559fb721be0601/image.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


cc: @cperessini

See merge request !8012</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Updates the font weight of button styles because of the change to system fonts

## What does this MR do?

Updates the font weight of button styles because of the change to system fonts

## Are there points in the code the reviewer needs to double check?
-

## Why was this MR needed?

Because of the change to system fonts the font weight for buttons needed to be toned down a bit.

Seems only buttons styles were affected.

## Screenshots (if relevant)

left = result

![image](/uploads/c75868dca76561cafd559fb721be0601/image.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


cc: @cperessini

See merge request !8012</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'members-dropdowns' into 'master'</title>
<updated>2016-12-09T18:11:47+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-12-09T18:11:47+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5bb43bb9531422545f974df8a6cf5616b7631f51'/>
<id>5bb43bb9531422545f974df8a6cf5616b7631f51</id>
<content type='text'>

Updated members dropdowns

## What does this MR do?

EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts.

## Screenshots (if relevant)

![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png)

See merge request !7974</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Updated members dropdowns

## What does this MR do?

EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts.

## Screenshots (if relevant)

![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png)

See merge request !7974</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'followup-7899' into 'master'</title>
<updated>2016-12-09T17:59:29+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2016-12-09T17:59:29+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b546fd7bba7434c787debb92e944b34420a0ee4c'/>
<id>b546fd7bba7434c787debb92e944b34420a0ee4c</id>
<content type='text'>

Use a single query in Projects::ProjectMembersController to fetch members

See merge request !7997</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Use a single query in Projects::ProjectMembersController to fetch members

See merge request !7997</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update/installation-from-source-guide-8-15' into 'master'</title>
<updated>2016-12-09T17:31:07+00:00</updated>
<author>
<name>Alejandro Rodríguez</name>
<email>alejorro70@gmail.com</email>
</author>
<published>2016-12-09T17:31:07+00:00</published>
<link rel='alternate' type='text/html' href='http://trove.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=43bd03ea54280af8b29130d0099a2bf6987b80d8'/>
<id>43bd03ea54280af8b29130d0099a2bf6987b80d8</id>
<content type='text'>

Update "Installation from source" guide for 8.15.0

Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1.

See merge request !8015</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update "Installation from source" guide for 8.15.0

Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1.

See merge request !8015</pre>
</div>
</content>
</entry>
</feed>
