<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch fix-side-by-side-comment-widget</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>Added diff comments feature test</title>
<updated>2016-07-19T12:36:04+00:00</updated>
<author>
<name>Luke "Jared" Bennett</name>
<email>lbennett@gitlab.com</email>
</author>
<published>2016-07-19T06:23:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c11e4d1539d0e3acd393bd1b384aa821bb5b3d30'/>
<id>c11e4d1539d0e3acd393bd1b384aa821bb5b3d30</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Updated CHANGELOG.</title>
<updated>2016-07-18T23:21:36+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-18T17:11:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=baeaad566f1db7dcc9fc2fcaba30020702554095'/>
<id>baeaad566f1db7dcc9fc2fcaba30020702554095</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Off mouse listener from document for diff comment button.</title>
<updated>2016-07-18T23:21:36+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-15T00:05:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4d302859a2504689318c409a82844b046b61b08c'/>
<id>4d302859a2504689318c409a82844b046b61b08c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix inline view for comment button selector.</title>
<updated>2016-07-18T23:21:36+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-14T23:15:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=159135291af0066b6c1fdbae04e2f05a785986aa'/>
<id>159135291af0066b6c1fdbae04e2f05a785986aa</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Revert "Refactored .prev and .next methods"</title>
<updated>2016-07-18T23:21:36+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-14T23:02:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c7ffc71224dd8e1ce42372c9310bbcc937a00d2c'/>
<id>c7ffc71224dd8e1ce42372c9310bbcc937a00d2c</id>
<content type='text'>
This reverts commit ec37d9553274e3bca58e4de44b932cdc72a37325.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This reverts commit ec37d9553274e3bca58e4de44b932cdc72a37325.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'mr-widget-alignment' into 'master'</title>
<updated>2016-07-18T23:06:45+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-18T23:06:45+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ac828424646e14ec9d2032421c5ada91a8fd7dc9'/>
<id>ac828424646e14ec9d2032421c5ada91a8fd7dc9</id>
<content type='text'>

Fixed the alignment in the MR widget

## What does this MR do?

Fixes the alignment of the browse button in the MR widget

## Screenshots (if relevant)

![Screen_Shot_2016-07-17_at_17.47.54](/uploads/41dcb0fad38fdd4dbccfda5ffaeaec6e/Screen_Shot_2016-07-17_at_17.47.54.png)

See merge request !5307</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fixed the alignment in the MR widget

## What does this MR do?

Fixes the alignment of the browse button in the MR widget

## Screenshots (if relevant)

![Screen_Shot_2016-07-17_at_17.47.54](/uploads/41dcb0fad38fdd4dbccfda5ffaeaec6e/Screen_Shot_2016-07-17_at_17.47.54.png)

See merge request !5307</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sidebar-dropdowns-blur-link' into 'master'</title>
<updated>2016-07-18T23:03:16+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-07-18T23:03:16+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a046a568ea913e446fe47c57e36b729b073564ad'/>
<id>a046a568ea913e446fe47c57e36b729b073564ad</id>
<content type='text'>

Blurs the clicked link in dropdown menus

## What does this MR do?

This fixes an issue where the dropdown menu would stay visible even when clicked out of it

See merge request !5322</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Blurs the clicked link in dropdown menus

## What does this MR do?

This fixes an issue where the dropdown menu would stay visible even when clicked out of it

See merge request !5322</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'bug/sidekiq-cron-better-error' into 'master'</title>
<updated>2016-07-18T22:31:01+00:00</updated>
<author>
<name>Gabriel Mazetto</name>
<email>gabriel@gitlab.com</email>
</author>
<published>2016-07-18T22:31:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=777a080892f710915c8f4d62864813ef388a1873'/>
<id>777a080892f710915c8f4d62864813ef388a1873</id>
<content type='text'>

Improve cron_jobs loading error messages

## What does this MR do?

Improves the error message from "Sidekiq Cron Jobs" plugin, when trying to load a incorrect definition from gitlab config files.

This is the output before the fix:

```
2016-06-08T16:43:19.277Z 2890 TID-gso49ojro INFO: Booting Sidekiq 4.1.2 with redis options {:url=&gt;"unix:/var/run/redis/redis.sock", :namespace=&gt;"resque:gitlab"}
undefined method `delete' for nil:NilClass
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `block (2 levels) in &lt;top (required)&gt;'
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `each'
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `block in &lt;top (required)&gt;'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/sidekiq-4.1.2/lib/sidekiq.rb:70:in `configure_server'
```

This is the output after the fix:

```
2016-07-18T10:53:22.414Z 66332 TID-oxal1bmik INFO: Booting Sidekiq 4.1.4 with redis options {:url=&gt;"redis://localhost:6378", :namespace=&gt;"resque:gitlab"}
Invalid cron_jobs config key: 'registry'. Check your gitlab config file.
/home/git/gitlab/config/initializers/sidekiq.rb:21:in `block (2 levels) in &lt;top (required)&gt;'
/home/git/gitlab/config/initializers/sidekiq.rb:17:in `each'
/home/git/gitlab/config/initializers/sidekiq.rb:17:in `block in &lt;top (required)&gt;'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/ruby-2.1.8/gems/sidekiq-4.1.4/lib/sidekiq.rb:70:in `configure_server'
```

Fixes #18378

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

Original error doesn't give any hint on where the problem can be, so the user can't easily troubleshoot unless he knows implementation details.

## What are the relevant issue numbers?

#18378

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5318</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Improve cron_jobs loading error messages

## What does this MR do?

Improves the error message from "Sidekiq Cron Jobs" plugin, when trying to load a incorrect definition from gitlab config files.

This is the output before the fix:

```
2016-06-08T16:43:19.277Z 2890 TID-gso49ojro INFO: Booting Sidekiq 4.1.2 with redis options {:url=&gt;"unix:/var/run/redis/redis.sock", :namespace=&gt;"resque:gitlab"}
undefined method `delete' for nil:NilClass
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `block (2 levels) in &lt;top (required)&gt;'
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `each'
/home/git/gitlab/config/initializers/sidekiq.rb:16:in `block in &lt;top (required)&gt;'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/sidekiq-4.1.2/lib/sidekiq.rb:70:in `configure_server'
```

This is the output after the fix:

```
2016-07-18T10:53:22.414Z 66332 TID-oxal1bmik INFO: Booting Sidekiq 4.1.4 with redis options {:url=&gt;"redis://localhost:6378", :namespace=&gt;"resque:gitlab"}
Invalid cron_jobs config key: 'registry'. Check your gitlab config file.
/home/git/gitlab/config/initializers/sidekiq.rb:21:in `block (2 levels) in &lt;top (required)&gt;'
/home/git/gitlab/config/initializers/sidekiq.rb:17:in `each'
/home/git/gitlab/config/initializers/sidekiq.rb:17:in `block in &lt;top (required)&gt;'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/ruby-2.1.8/gems/sidekiq-4.1.4/lib/sidekiq.rb:70:in `configure_server'
```

Fixes #18378

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

Original error doesn't give any hint on where the problem can be, so the user can't easily troubleshoot unless he knows implementation details.

## What are the relevant issue numbers?

#18378

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5318</pre>
</div>
</content>
</entry>
<entry>
<title>Improve cron_jobs loading error messages</title>
<updated>2016-07-18T21:52:58+00:00</updated>
<author>
<name>Gabriel Mazetto</name>
<email>gabriel@gitlab.com</email>
</author>
<published>2016-07-18T10:57:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aaba9ebbb196ae421178e962ccc1078fdcb98843'/>
<id>aaba9ebbb196ae421178e962ccc1078fdcb98843</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 'caironoleto/gitlab-ce-cn-issue-19747'</title>
<updated>2016-07-18T21:44:58+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2016-07-18T21:44:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=aba558a4a8c7e9e3c691c0e689a0926d4604a26a'/>
<id>aba558a4a8c7e9e3c691c0e689a0926d4604a26a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
