<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app, branch fix-git-http-routing</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Merge branch 'fix-award-emoji-hidden' into 'master'</title>
<updated>2016-06-09T00:27:09+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-09T00:27:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=13fd88faa3a334e0a9d221c578abde686d45e368'/>
<id>13fd88faa3a334e0a9d221c578abde686d45e368</id>
<content type='text'>

Shows award emoji for comments to all users who are logged in.

## What does this MR do?
Fixes the award emoji picker not showing up for users who weren't able to edit another user's comment.

## Screenshots (if relevant)
Before:

![Screen_Shot_2016-06-08_at_5.18.04_PM](/uploads/a8b40ba319481f53d55de055d84649b9/Screen_Shot_2016-06-08_at_5.18.04_PM.png)

After (logged in):
![Screen_Shot_2016-06-08_at_5.16.16_PM](/uploads/535edcca6fbdd8834beda39399f85384/Screen_Shot_2016-06-08_at_5.16.16_PM.png)

After (logged out):
![Screen_Shot_2016-06-08_at_5.15.08_PM](/uploads/7f0dff751714c7d20f78b56893cacd59/Screen_Shot_2016-06-08_at_5.15.08_PM.png)

cc: @fatihacet 

See merge request !4547</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Shows award emoji for comments to all users who are logged in.

## What does this MR do?
Fixes the award emoji picker not showing up for users who weren't able to edit another user's comment.

## Screenshots (if relevant)
Before:

![Screen_Shot_2016-06-08_at_5.18.04_PM](/uploads/a8b40ba319481f53d55de055d84649b9/Screen_Shot_2016-06-08_at_5.18.04_PM.png)

After (logged in):
![Screen_Shot_2016-06-08_at_5.16.16_PM](/uploads/535edcca6fbdd8834beda39399f85384/Screen_Shot_2016-06-08_at_5.16.16_PM.png)

After (logged out):
![Screen_Shot_2016-06-08_at_5.15.08_PM](/uploads/7f0dff751714c7d20f78b56893cacd59/Screen_Shot_2016-06-08_at_5.15.08_PM.png)

cc: @fatihacet 

See merge request !4547</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'mention-loading-indicator' into 'master'</title>
<updated>2016-06-08T23:38:43+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-08T23:38:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f5818baffd305f6ea6a9cf8b00e0270cd43f3761'/>
<id>f5818baffd305f6ea6a9cf8b00e0270cd43f3761</id>
<content type='text'>

Show loading indicator for autocomplete

![autocomplete](/uploads/397df34689aeb5f4cbca99aea209c8cf/autocomplete.gif)

Closes #15435

See merge request !4182</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Show loading indicator for autocomplete

![autocomplete](/uploads/397df34689aeb5f4cbca99aea209c8cf/autocomplete.gif)

Closes #15435

See merge request !4182</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master'</title>
<updated>2016-06-08T23:38:29+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-08T23:38:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e382f13068bc4301c5483ace92cfff266558670d'/>
<id>e382f13068bc4301c5483ace92cfff266558670d</id>
<content type='text'>

#17284 Edit form does not cancel correctly

## What does this MR do?

Replaces the markdown textarea with the currently saved note text when the note edit is cancelled.

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

Allows the user to revert back to the original note text, as expected, using cancel.

## What are the relevant issue numbers?

Fixes #17284.

## Screenshots

![17284](/uploads/c3598de6f8e70d52275ef25907d92d42/17284.gif)

See merge request !4175</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

#17284 Edit form does not cancel correctly

## What does this MR do?

Replaces the markdown textarea with the currently saved note text when the note edit is cancelled.

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

Allows the user to revert back to the original note text, as expected, using cancel.

## What are the relevant issue numbers?

Fixes #17284.

## Screenshots

![17284](/uploads/c3598de6f8e70d52275ef25907d92d42/17284.gif)

See merge request !4175</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'nav-scroll-bug' into 'master'</title>
<updated>2016-06-08T23:32:47+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-08T23:32:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cc54b74a3cffc366ad67bd2c4d645f35d1b04e52'/>
<id>cc54b74a3cffc366ad67bd2c4d645f35d1b04e52</id>
<content type='text'>

Side nav scrolls if content height taller than screen

## What does this MR do?
Header logo is now fixed at top; put back scrolling functionality in side nav

## Screenshots (if relevant)
&lt;img src="/uploads/e1d1b60c296c39c61d7fe7da22b6c52d/scroll.gif" width="600px"&gt;

See merge request !4513</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Side nav scrolls if content height taller than screen

## What does this MR do?
Header logo is now fixed at top; put back scrolling functionality in side nav

## Screenshots (if relevant)
&lt;img src="/uploads/e1d1b60c296c39c61d7fe7da22b6c52d/scroll.gif" width="600px"&gt;

See merge request !4513</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'git-http-no-authenticity-token' into 'master'</title>
<updated>2016-06-08T23:29:23+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-06-08T23:29:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5d66e0e0e33d0a4c0627dda60008bf889dfa9137'/>
<id>5d66e0e0e33d0a4c0627dda60008bf889dfa9137</id>
<content type='text'>

Disable CSRF protection when serving Git HTTP clients

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18331

See merge request !4538</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Disable CSRF protection when serving Git HTTP clients

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18331

See merge request !4538</pre>
</div>
</content>
</entry>
<entry>
<title>Shows award emoji for comments to all users who are logged in.</title>
<updated>2016-06-08T23:09:48+00:00</updated>
<author>
<name>Connor Shea</name>
<email>connor.james.shea@gmail.com</email>
</author>
<published>2016-06-08T23:09:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bdc995bf00794f96af46d92f61a940896c1404d0'/>
<id>bdc995bf00794f96af46d92f61a940896c1404d0</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 '17240-svg' into 'master'</title>
<updated>2016-06-08T22:58:09+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-08T22:58:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0001a0cf9dfd7217639ce82648d1908926a8e874'/>
<id>0001a0cf9dfd7217639ce82648d1908926a8e874</id>
<content type='text'>

Add new icons in left sidebar and layout nav

Closes #17609    
Closes #17240    
Closes #17321    

![Screen_Shot_2016-06-02_at_8.47.38_AM](/uploads/f254fe81cba65cbdeb8e5720f0b2fc19/Screen_Shot_2016-06-02_at_8.47.38_AM.png)
![Screen_Shot_2016-06-02_at_8.53.33_AM](/uploads/2c27284f0a4916fe447794d9b663c4df/Screen_Shot_2016-06-02_at_8.53.33_AM.png)

@skyruler I couldn't find the icons for `Projects`, `Merge Requests`, `Snippets`, or `Help` in the design repo. Do you have them available somewhere?

See merge request !4268</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add new icons in left sidebar and layout nav

Closes #17609    
Closes #17240    
Closes #17321    

![Screen_Shot_2016-06-02_at_8.47.38_AM](/uploads/f254fe81cba65cbdeb8e5720f0b2fc19/Screen_Shot_2016-06-02_at_8.47.38_AM.png)
![Screen_Shot_2016-06-02_at_8.53.33_AM](/uploads/2c27284f0a4916fe447794d9b663c4df/Screen_Shot_2016-06-02_at_8.53.33_AM.png)

@skyruler I couldn't find the icons for `Projects`, `Merge Requests`, `Snippets`, or `Help` in the design repo. Do you have them available somewhere?

See merge request !4268</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18333-layout-bug' into 'master'</title>
<updated>2016-06-08T21:28:36+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-08T21:28:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8578f4011a0575717ca5eee02b77bf90bd9e21e0'/>
<id>8578f4011a0575717ca5eee02b77bf90bd9e21e0</id>
<content type='text'>

Use container helper instead of hard coded container

## What does this MR do?
Add `container_class` helper class to fix layout bug

## What are the relevant issue numbers?
#18333 
## Screenshots (if relevant)
Fixed:    
![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png)
Fluid:     
![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png)

See merge request !4543</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Use container helper instead of hard coded container

## What does this MR do?
Add `container_class` helper class to fix layout bug

## What are the relevant issue numbers?
#18333 
## Screenshots (if relevant)
Fixed:    
![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png)
Fluid:     
![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png)

See merge request !4543</pre>
</div>
</content>
</entry>
<entry>
<title>Fix activity SVG</title>
<updated>2016-06-08T21:15:30+00:00</updated>
<author>
<name>Annabel Dunstone</name>
<email>annabel.dunstone@gmail.com</email>
</author>
<published>2016-06-08T21:15:30+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a280116a058bb74f3fa29f40caf2ac962b662f49'/>
<id>a280116a058bb74f3fa29f40caf2ac962b662f49</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 'dropdown-link-lineheight' into 'master'</title>
<updated>2016-06-08T20:59:46+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-08T20:59:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b4812e2e867d1b738fc93afb3c5e5d1fd57ccd1d'/>
<id>b4812e2e867d1b738fc93afb3c5e5d1fd57ccd1d</id>
<content type='text'>

Fixed dropdown link line-height

## What does this MR do?

Fixes line-height issue on dropdown menu links

## Why was this MR needed?

The line-height of some dropdown links were taking the parent, most noticeable the commit header

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png)

After:

![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png)

See merge request !4531</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fixed dropdown link line-height

## What does this MR do?

Fixes line-height issue on dropdown menu links

## Why was this MR needed?

The line-height of some dropdown links were taking the parent, most noticeable the commit header

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png)

After:

![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png)

See merge request !4531</pre>
</div>
</content>
</entry>
</feed>
