<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch fix-markdown-spec</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>Fix description and GFM pipelines conflicting</title>
<updated>2016-06-13T12:06:40+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-06-13T12:06:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=03d2bf141cde7bb12f88f25bcb08a612e65044c4'/>
<id>03d2bf141cde7bb12f88f25bcb08a612e65044c4</id>
<content type='text'>
Consider this command:

    bundle exec rails r "include GitlabMarkdownHelper
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;', pipeline: :description)
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;')"

And the same in the opposite order:

    bundle exec rails r "include GitlabMarkdownHelper
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;')
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;', pipeline: :description)"

Before this change, they would both output:

    &lt;p&gt;&lt;span&gt;this is a span&lt;/span&gt;&lt;/p&gt;
    &lt;p&gt;this is a span&lt;/p&gt;

That's because `span` is added to the list of whitelisted elements in
the `SanitizationFilter`, but this method tries not to make the same
changes multiple times. Unfortunately,
`HTML::Pipeline::SanitizationFilter::LIMITED`, which is used by the
`DescriptionPipeline`, uses the same Ruby objects for all of its hash
values _except_ `:elements`.

That means that whichever of `DescriptionPipeline` and `GfmPipeline` is
called first would have `span` in its whitelisted elements, and the
second wouldn't.

Fix this by creating an entirely separate hash, before either pipeline
is invoked.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Consider this command:

    bundle exec rails r "include GitlabMarkdownHelper
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;', pipeline: :description)
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;')"

And the same in the opposite order:

    bundle exec rails r "include GitlabMarkdownHelper
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;')
    puts markdown('&lt;span&gt;this is a span&lt;/span&gt;', pipeline: :description)"

Before this change, they would both output:

    &lt;p&gt;&lt;span&gt;this is a span&lt;/span&gt;&lt;/p&gt;
    &lt;p&gt;this is a span&lt;/p&gt;

That's because `span` is added to the list of whitelisted elements in
the `SanitizationFilter`, but this method tries not to make the same
changes multiple times. Unfortunately,
`HTML::Pipeline::SanitizationFilter::LIMITED`, which is used by the
`DescriptionPipeline`, uses the same Ruby objects for all of its hash
values _except_ `:elements`.

That means that whichever of `DescriptionPipeline` and `GfmPipeline` is
called first would have `span` in its whitelisted elements, and the
second wouldn't.

Fix this by creating an entirely separate hash, before either pipeline
is invoked.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'cs-issue-pr-templates' into 'master'</title>
<updated>2016-06-10T10:42:27+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-06-10T10:42:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cfc99bbd1390bc548a703fdc7857c7db5b0e7c13'/>
<id>cfc99bbd1390bc548a703fdc7857c7db5b0e7c13</id>
<content type='text'>

Add Issue/PR Templates to deter issues/contributions on the GitHub mirror of the project

## What does this MR do?
Adds GitHub-specific `ISSUE_TEMPLATE.md` and `PULL_REQUEST_TEMPLATE.md` files in a `.github` directory. To prevent new issues/PRs, I figured it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.

## Are there points in the code the reviewer needs to double check?
Wording/phrasing, mostly.

## Why was this MR needed?
The GitHub issue tracker is being closed, and PRs on GitHub haven't been accepted for a while now. This was discussed briefly during the GitLab Strategy Session at the Austin Summit.

cc: @dzaporozhets @rymai  @MrChrisW @dblessing @virtuacreative @amara  

See merge request !4324</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Add Issue/PR Templates to deter issues/contributions on the GitHub mirror of the project

## What does this MR do?
Adds GitHub-specific `ISSUE_TEMPLATE.md` and `PULL_REQUEST_TEMPLATE.md` files in a `.github` directory. To prevent new issues/PRs, I figured it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.

## Are there points in the code the reviewer needs to double check?
Wording/phrasing, mostly.

## Why was this MR needed?
The GitHub issue tracker is being closed, and PRs on GitHub haven't been accepted for a while now. This was discussed briefly during the GitLab Strategy Session at the Austin Summit.

cc: @dzaporozhets @rymai  @MrChrisW @dblessing @virtuacreative @amara  

See merge request !4324</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'enable-rubocop-for-migrations' into 'master'</title>
<updated>2016-06-10T10:38:48+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-10T10:38:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0dcd050bf4b30e56247c897c2aac4daeb9aa56dc'/>
<id>0dcd050bf4b30e56247c897c2aac4daeb9aa56dc</id>
<content type='text'>

Enable RuboCop for migrations

## What does this MR do?

Enable RuboCop for all files inside `db/migrate`, then add magic comments to all existing files, so that this only affects new migrations.

## Are there points in the code the reviewer needs to double check?

This entire change is a config change and a bunch of comments.

## Why was this MR needed?

```
Yorick Peterse [11:55 AM]  
I don't think we have any use case for nested def, might as well blacklist it

Sean McGivern [11:57 AM]  
http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Lint/NestedMethodDefinition

Sean McGivern [11:57 AM]  
hmm, it's already enabled

Sean McGivern [11:57 AM]  
... because we exclude `db/` from rubocop :slightly_smiling_face:

Douwe Maan [11:57 AM]  
@smcgivern: heh

Sean McGivern [11:59 AM]  
I guess that's because we don't want to change the old migrations? I wonder if it's worth enabling it and adding magic comments to all the previous ones to ignore rubocop

Douwe Maan [11:59 AM]  
@smcgivern: agreed
```

## What are the relevant issue numbers?

None.

## Screenshots (if relevant)

None, but if I remove the magic comment from the migration `20160416182152_convert_award_note_to_emoji_award.rb` I get:
```
$ be rubocop
Inspecting 1959 files
..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................W....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

db/migrate/20160416182152_convert_award_note_to_emoji_award.rb:3:5: W: Lint/NestedMethodDefinition: Method definitions must not be nested. Use lambda instead.
    def up ...
    ^^^^^^

1959 files inspected, 1 offense detected
```

## 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 !4559</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Enable RuboCop for migrations

## What does this MR do?

Enable RuboCop for all files inside `db/migrate`, then add magic comments to all existing files, so that this only affects new migrations.

## Are there points in the code the reviewer needs to double check?

This entire change is a config change and a bunch of comments.

## Why was this MR needed?

```
Yorick Peterse [11:55 AM]  
I don't think we have any use case for nested def, might as well blacklist it

Sean McGivern [11:57 AM]  
http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Lint/NestedMethodDefinition

Sean McGivern [11:57 AM]  
hmm, it's already enabled

Sean McGivern [11:57 AM]  
... because we exclude `db/` from rubocop :slightly_smiling_face:

Douwe Maan [11:57 AM]  
@smcgivern: heh

Sean McGivern [11:59 AM]  
I guess that's because we don't want to change the old migrations? I wonder if it's worth enabling it and adding magic comments to all the previous ones to ignore rubocop

Douwe Maan [11:59 AM]  
@smcgivern: agreed
```

## What are the relevant issue numbers?

None.

## Screenshots (if relevant)

None, but if I remove the magic comment from the migration `20160416182152_convert_award_note_to_emoji_award.rb` I get:
```
$ be rubocop
Inspecting 1959 files
..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................W....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

db/migrate/20160416182152_convert_award_note_to_emoji_award.rb:3:5: W: Lint/NestedMethodDefinition: Method definitions must not be nested. Use lambda instead.
    def up ...
    ^^^^^^

1959 files inspected, 1 offense detected
```

## 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 !4559</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'gh-rate-limit' into 'master'</title>
<updated>2016-06-10T10:34:19+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-10T10:34:19+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=a9a9f19b0b245a5829b0626d539c81c7cd28d46c'/>
<id>a9a9f19b0b245a5829b0626d539c81c7cd28d46c</id>
<content type='text'>

Wrap all rate limiting logic inside GitHub API client

## What does this MR do?

Move the actual rate limiting logic to GitHub API to clean the code inside the GitHub importer, and avoid code duplication.

## Are there points in the code the reviewer needs to double check?

No there aren't.

## Why was this MR needed?

Avoid code duplication to handle API rate limit in every call to the GitHub API.

## What are the relevant issue numbers?

There are none.

## Screenshots (if relevant)

Not relevant.

See merge request !4552</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Wrap all rate limiting logic inside GitHub API client

## What does this MR do?

Move the actual rate limiting logic to GitHub API to clean the code inside the GitHub importer, and avoid code duplication.

## Are there points in the code the reviewer needs to double check?

No there aren't.

## Why was this MR needed?

Avoid code duplication to handle API rate limit in every call to the GitHub API.

## What are the relevant issue numbers?

There are none.

## Screenshots (if relevant)

Not relevant.

See merge request !4552</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '18447-investigate-smtp-error' into 'master'</title>
<updated>2016-06-10T09:36:51+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-06-10T09:36:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e0f3e44b3e67b80543b6956c7ae46035fabc696f'/>
<id>e0f3e44b3e67b80543b6956c7ae46035fabc696f</id>
<content type='text'>

Fix failing `EmailOnPush` spec.

Closes #18447 

- This should fix CI on master

/cc @smcgivern @ayufan @stanhu @pacoguzman 

See merge request !4582</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix failing `EmailOnPush` spec.

Closes #18447 

- This should fix CI on master

/cc @smcgivern @ayufan @stanhu @pacoguzman 

See merge request !4582</pre>
</div>
</content>
</entry>
<entry>
<title>Fix failing `EmailOnPush` spec.</title>
<updated>2016-06-10T08:41:02+00:00</updated>
<author>
<name>Timothy Andrew</name>
<email>mail@timothyandrew.net</email>
</author>
<published>2016-06-10T08:34:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=99d5a91d7a1942f092c87010cbf93279979822a1'/>
<id>99d5a91d7a1942f092c87010cbf93279979822a1</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 'award-emoji-fixes' into 'master'</title>
<updated>2016-06-09T23:21:50+00:00</updated>
<author>
<name>Jacob Schatz</name>
<email>jschatz@gitlab.com</email>
</author>
<published>2016-06-09T23:21:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cea3cf177c68bb1fa9326d4e88631b7737ae8a98'/>
<id>cea3cf177c68bb1fa9326d4e88631b7737ae8a98</id>
<content type='text'>

Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550</pre>
</div>
</content>
</entry>
<entry>
<title>Minor MR comment fixes.</title>
<updated>2016-06-09T22:56:41+00:00</updated>
<author>
<name>Fatih Acet</name>
<email>acetfatih@gmail.com</email>
</author>
<published>2016-06-09T22:56:41+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=94826d9abe13a20aae0868a096a03d2a4e706d82'/>
<id>94826d9abe13a20aae0868a096a03d2a4e706d82</id>
<content type='text'>
yes -&gt; true
no -&gt; false
. frequent -&gt; .frequent-emojis
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
yes -&gt; true
no -&gt; false
. frequent -&gt; .frequent-emojis
</pre>
</div>
</content>
</entry>
<entry>
<title>Update CHANGELOG for 8.8.4 and 8.8.5</title>
<updated>2016-06-09T22:42:15+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2016-06-09T22:32:10+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=e328eab0da46f1a5d4fbf2289911ce8f4093cfb6'/>
<id>e328eab0da46f1a5d4fbf2289911ce8f4093cfb6</id>
<content type='text'>
[ci skip]
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
[ci skip]
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix-issue-15259-postgresql' into 'master'</title>
<updated>2016-06-09T22:35:47+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-06-09T22:35:47+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b51a36cb2b34b63246beac2bd7ebf4f646ca906a'/>
<id>b51a36cb2b34b63246beac2bd7ebf4f646ca906a</id>
<content type='text'>

Properly quote table name in Rake task for MySQL and PostgreSQL compatibility

!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.
    
Closes #15259

See merge request !4577</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Properly quote table name in Rake task for MySQL and PostgreSQL compatibility

!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.
    
Closes #15259

See merge request !4577</pre>
</div>
</content>
</entry>
</feed>
