<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/lib/api, 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>Allow custom text on 'almost there' page</title>
<updated>2016-06-08T18:08:53+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@gitlab.com</email>
</author>
<published>2016-05-09T15:12:53+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=40b6d9064a2ab6c89cb54b62536fe2952c6cbca6'/>
<id>40b6d9064a2ab6c89cb54b62536fe2952c6cbca6</id>
<content type='text'>
Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Tweak the styles for that page so that centered lists look reasonable.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Tweak the styles for that page so that centered lists look reasonable.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix pseudo n+1 queries with Note and Note Authors in issuables APIs</title>
<updated>2016-06-08T14:26:05+00:00</updated>
<author>
<name>Alejandro Rodríguez</name>
<email>alejorro70@gmail.com</email>
</author>
<published>2016-06-06T20:19:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fade1a4cdebb4124048e9764486812627333ff95'/>
<id>fade1a4cdebb4124048e9764486812627333ff95</id>
<content type='text'>
This was not a clear cut n+1 query, given that if you're directly subscribed to all issues
that the API is returning you never really need to check for the notes. However, if you're
subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and
once to `users` (for the authors). By preemtively loading notes and authors, at worst you have
1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading
of notes when counting user notes.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This was not a clear cut n+1 query, given that if you're directly subscribed to all issues
that the API is returning you never really need to check for the notes. However, if you're
subscribed to _all_ of them, then for each issuable you need to go once to `notes`, and
once to `users` (for the authors). By preemtively loading notes and authors, at worst you have
1 extra query, and at best you saved 2n extra queries. We also took advantage of this preloading
of notes when counting user notes.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller</title>
<updated>2016-06-08T08:31:33+00:00</updated>
<author>
<name>Jacob Vosmaer</name>
<email>jacob@gitlab.com</email>
</author>
<published>2016-06-08T08:31:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=bebe110dff812bd08fa7042e92cb8ae3c79e3bb8'/>
<id>bebe110dff812bd08fa7042e92cb8ae3c79e3bb8</id>
<content type='text'>
Conflicts:
	lib/gitlab/workhorse.rb
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	lib/gitlab/workhorse.rb
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3</title>
<updated>2016-06-06T14:46:44+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-06-06T14:46:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ef35ca238dd8ed1c8b8d8c3cfdf64630c6c781ff'/>
<id>ef35ca238dd8ed1c8b8d8c3cfdf64630c6c781ff</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/master' into rename-ci-commit</title>
<updated>2016-06-06T14:33:52+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-06-06T14:33:52+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d9b292f8726e46050e2d882a9a9fc1be95007d18'/>
<id>d9b292f8726e46050e2d882a9a9fc1be95007d18</id>
<content type='text'>
# Conflicts:
#	spec/features/builds_spec.rb
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
# Conflicts:
#	spec/features/builds_spec.rb
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3</title>
<updated>2016-06-06T09:21:54+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-06-06T09:21:54+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d225de32cb04a5d5e138463cb170bb19a9f6949c'/>
<id>d225de32cb04a5d5e138463cb170bb19a9f6949c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/master' into rename-ci-commit</title>
<updated>2016-06-06T09:20:17+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-06-06T09:20:17+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=7ad7e10feed624e263b5b80f5cafd4b0ed900ad7'/>
<id>7ad7e10feed624e263b5b80f5cafd4b0ed900ad7</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add a `U2fRegistrations` table/model.</title>
<updated>2016-06-06T07:20:31+00:00</updated>
<author>
<name>Timothy Andrew</name>
<email>mail@timothyandrew.net</email>
</author>
<published>2016-06-06T04:38:42+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=791cc9138be6ea1783e3c3853370cf0290f4d41e'/>
<id>791cc9138be6ea1783e3c3853370cf0290f4d41e</id>
<content type='text'>
- To hold registrations from U2F devices, and to authenticate them.
- Previously, `User#two_factor_enabled` was aliased to the
  `otp_required_for_login` column on `users`.
- This commit changes things a bit:
    - `User#two_factor_enabled` is not a method anymore
    - `User#two_factor_enabled?` checks both the
      `otp_required_for_login` column, as well as `U2fRegistration`s
    - Change all instances of `User#two_factor_enabled` to
      `User#two_factor_enabled?`
- Add the `u2f` gem, and implement registration/authentication at the
  model level.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- To hold registrations from U2F devices, and to authenticate them.
- Previously, `User#two_factor_enabled` was aliased to the
  `otp_required_for_login` column on `users`.
- This commit changes things a bit:
    - `User#two_factor_enabled` is not a method anymore
    - `User#two_factor_enabled?` checks both the
      `otp_required_for_login` column, as well as `U2fRegistration`s
    - Change all instances of `User#two_factor_enabled` to
      `User#two_factor_enabled?`
- Add the `u2f` gem, and implement registration/authentication at the
  model level.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rubocop/enable-ambiguous-operator-rubocop-lint' into 'master'</title>
<updated>2016-06-05T19:08:56+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>robert@gitlab.com</email>
</author>
<published>2016-06-05T19:08:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=cc0ea13d21de6adb1ac361024ee88d383b267cc7'/>
<id>cc0ea13d21de6adb1ac361024ee88d383b267cc7</id>
<content type='text'>

Enable Lint/AmbiguousOperator rubocop cop

Enforce using parentheses if ambiguous operators are detected, like `header *some_method` or `array.select &amp;:even?`.

See #17478

See merge request !4454</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>

Enable Lint/AmbiguousOperator rubocop cop

Enforce using parentheses if ambiguous operators are detected, like `header *some_method` or `array.select &amp;:even?`.

See #17478

See merge request !4454</pre>
</div>
</content>
</entry>
<entry>
<title>Rename all ci_commit[s] in application code to pipeline[s]</title>
<updated>2016-06-03T14:27:50+00:00</updated>
<author>
<name>Kamil Trzcinski</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2016-06-03T14:27:50+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1927a2d30bf88ab9fe3c1235cb529f5fd8dc01be'/>
<id>1927a2d30bf88ab9fe3c1235cb529f5fd8dc01be</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
