<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git, branch 22578-cycle-analytics-incorrect-commit-count</title>
<subtitle>gitlab.com: gitlab-org/gitlab-ce.git
</subtitle>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/'/>
<entry>
<title>Update CHANGELOG</title>
<updated>2016-09-26T13:08:40+00:00</updated>
<author>
<name>Timothy Andrew</name>
<email>mail@timothyandrew.net</email>
</author>
<published>2016-09-26T04:39:58+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=da1fa1e14f86c1deabe047f61e6526e4870a07c5'/>
<id>da1fa1e14f86c1deabe047f61e6526e4870a07c5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix the "Commits" section of the cycle analytics summary.</title>
<updated>2016-09-26T13:08:40+00:00</updated>
<author>
<name>Timothy Andrew</name>
<email>mail@timothyandrew.net</email>
</author>
<published>2016-09-26T04:33:57+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c0ecef79fe936b9e71384f8d951fc5503f26f4a7'/>
<id>c0ecef79fe936b9e71384f8d951fc5503f26f4a7</id>
<content type='text'>
- The commit count was capped at 10, due to
  `Gitlab::Git::Repository#log` enforcing a limit, with the default set
  to 10.

- Reimplement a small portion of this `log` function to get just the
  data we need.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- The commit count was capped at 10, due to
  `Gitlab::Git::Repository#log` enforcing a limit, with the default set
  to 10.

- Reimplement a small portion of this `log` function to get just the
  data we need.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'update-gem' into 'master'</title>
<updated>2016-09-26T11:25:07+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-26T11:25:07+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f1bfb872877df7baf36d2de1ad5dfdb4c8604c9b'/>
<id>f1bfb872877df7baf36d2de1ad5dfdb4c8604c9b</id>
<content type='text'>

Update sprockets version to 3.7.0

Closes #22277

See merge request !6489</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update sprockets version to 3.7.0

Closes #22277

See merge request !6489</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'robots-snippets' into 'master'</title>
<updated>2016-09-26T10:45:30+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-26T10:45:30+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ebc4299d8c025601a0e6ca8066252b3132349291'/>
<id>ebc4299d8c025601a0e6ca8066252b3132349291</id>
<content type='text'>

Update robots.txt disallow to allow users/groups starting with "s"

## What does this MR do?

Update robots.txt "Disallow: /s" line to "Disallow: /s/"

## Why was this MR needed?

Currently any Project that is under a username or group name that starts with "s" cannot be indexed because of this disallow line.

For example on https://gitlab.com looking at the projects with the most stars there is this project: https://gitlab.com/somerobots/Trident

If you do a Google search for "site:gitlab.com Trident", the project comes up but with "A description for this result is not available because of this site's robots.txt"

Adding the trailing slash will still disallow all snippet short urls, but start allowing projects where the URI begins with "s"

See merge request !6481</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Update robots.txt disallow to allow users/groups starting with "s"

## What does this MR do?

Update robots.txt "Disallow: /s" line to "Disallow: /s/"

## Why was this MR needed?

Currently any Project that is under a username or group name that starts with "s" cannot be indexed because of this disallow line.

For example on https://gitlab.com looking at the projects with the most stars there is this project: https://gitlab.com/somerobots/Trident

If you do a Google search for "site:gitlab.com Trident", the project comes up but with "A description for this result is not available because of this site's robots.txt"

Adding the trailing slash will still disallow all snippet short urls, but start allowing projects where the URI begins with "s"

See merge request !6481</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'patch-2' into 'master'</title>
<updated>2016-09-26T10:10:05+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-26T10:10:05+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=477f0309868bb7adcbb7901a7d2f13913ca9b4ba'/>
<id>477f0309868bb7adcbb7901a7d2f13913ca9b4ba</id>
<content type='text'>

Fixed a broken documentation link to the wiki-specific-markdown.

## What does this MR do?
Fixes a broken link

## Are there points in the code the reviewer needs to double check?
Well, it's a one line change, so it couldn't hurt, right?

## Why was this MR needed?
Because broken links make us look like chumps. :)

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?
Probably not.

## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21760.

See merge request !6117</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fixed a broken documentation link to the wiki-specific-markdown.

## What does this MR do?
Fixes a broken link

## Are there points in the code the reviewer needs to double check?
Well, it's a one line change, so it couldn't hurt, right?

## Why was this MR needed?
Because broken links make us look like chumps. :)

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?
Probably not.

## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21760.

See merge request !6117</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'api-alphabetical' into 'master'</title>
<updated>2016-09-26T09:39:36+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-26T09:39:36+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fca610e5cbf5382f3814120227a0ca11440c8a9f'/>
<id>fca610e5cbf5382f3814120227a0ca11440c8a9f</id>
<content type='text'>

Keep API mounts in alphabetical order

## What does this MR do?

Just a cosmetic change to keep the API mounts in order.

See merge request !6515</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Keep API mounts in alphabetical order

## What does this MR do?

Just a cosmetic change to keep the API mounts in order.

See merge request !6515</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix/import-services' into 'master'</title>
<updated>2016-09-26T09:38:09+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-26T09:38:09+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=adf50202d773cad57f57b6fd8bb0454216fbe877'/>
<id>adf50202d773cad57f57b6fd8bb0454216fbe877</id>
<content type='text'>

Fixes issue with rails reserved keyword type exporting/importing services.

The attribute `type`in services was being ignored by Import/Export. Added `type` as a method call in the export, as `type` gets ignored invoking `to_json`, manually adding this as a method in `import_export.yml` solves the problem. 

On a different note, I found assigning a title directly to `CustomIssueTrackerService` didn't play very well with `prop_accessor`:

```ruby
&gt; CustomIssueTrackerService.new(title: 'asdf')
NoMethodError: undefined method `[]=' for nil:NilClass
&gt; CustomIssueTrackerService.new(title: nil)
NoMethodError: undefined method `[]=' for nil:NilClass
```

This was also causing the Import/Export to failed... So I added a custom setter that fixed the problem.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22461

See merge request !6499</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fixes issue with rails reserved keyword type exporting/importing services.

The attribute `type`in services was being ignored by Import/Export. Added `type` as a method call in the export, as `type` gets ignored invoking `to_json`, manually adding this as a method in `import_export.yml` solves the problem. 

On a different note, I found assigning a title directly to `CustomIssueTrackerService` didn't play very well with `prop_accessor`:

```ruby
&gt; CustomIssueTrackerService.new(title: 'asdf')
NoMethodError: undefined method `[]=' for nil:NilClass
&gt; CustomIssueTrackerService.new(title: nil)
NoMethodError: undefined method `[]=' for nil:NilClass
```

This was also causing the Import/Export to failed... So I added a custom setter that fixed the problem.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22461

See merge request !6499</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'ldap' into 'master'</title>
<updated>2016-09-26T09:24:22+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-26T09:24:22+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bb8a41b2cbfcc05f49ca15466d54220be1e20cd5'/>
<id>bb8a41b2cbfcc05f49ca15466d54220be1e20cd5</id>
<content type='text'>

Replace deprecated Devise helper with new helper

Closes #22357

See merge request !6462</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Replace deprecated Devise helper with new helper

Closes #22357

See merge request !6462</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'fix_trivial_doc_typo' into 'master'</title>
<updated>2016-09-26T08:38:31+00:00</updated>
<author>
<name>Rémy Coutable</name>
<email>remy@rymai.me</email>
</author>
<published>2016-09-26T08:38:31+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=23ed83a185f611443935c1c68472695b4439fc81'/>
<id>23ed83a185f611443935c1c68472695b4439fc81</id>
<content type='text'>

Fix trivial typo in docs



See merge request !5849</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Fix trivial typo in docs



See merge request !5849</pre>
</div>
</content>
</entry>
<entry>
<title>fix changelog</title>
<updated>2016-09-26T07:49:49+00:00</updated>
<author>
<name>James Lopez</name>
<email>james@jameslopez.es</email>
</author>
<published>2016-09-26T07:49:49+00:00</published>
<link rel='alternate' type='text/html' href='http://91.123.203.49/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d70944d911ec49bc623982655d11e6bfcadf79b8'/>
<id>d70944d911ec49bc623982655d11e6bfcadf79b8</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
