<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app, branch pre-commit-prettier</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 'layout-nav-es-module' into 'master'</title>
<updated>2017-12-20T14:15:24+00:00</updated>
<author>
<name>Filipa Lacerda</name>
<email>filipa@gitlab.com</email>
</author>
<published>2017-12-20T14:15:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f5290c9738bbca7b130ddc86c0cdcc3f35e34c3a'/>
<id>f5290c9738bbca7b130ddc86c0cdcc3f35e34c3a</id>
<content type='text'>
Changed layout_nav to ES module

See merge request gitlab-org/gitlab-ce!16003</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Changed layout_nav to ES module

See merge request gitlab-org/gitlab-ce!16003</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master'</title>
<updated>2017-12-20T12:22:51+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-12-20T12:22:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=0969fdffda4070173651e6e0f405ccd4c77436f0'/>
<id>0969fdffda4070173651e6e0f405ccd4c77436f0</id>
<content type='text'>
Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted

Closes #39246

See merge request gitlab-org/gitlab-ce!15844</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted

Closes #39246

See merge request gitlab-org/gitlab-ce!15844</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'rs-blocks-json-serialization' into 'master'</title>
<updated>2017-12-20T12:02:21+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-12-20T12:02:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=d318075abac822b657e37912e049b8d8958b189a'/>
<id>d318075abac822b657e37912e049b8d8958b189a</id>
<content type='text'>
Add BlocksJsonSerialization model concern and include it in User

Closes #37947

See merge request gitlab-org/gitlab-ce!14350</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add BlocksJsonSerialization model concern and include it in User

Closes #37947

See merge request gitlab-org/gitlab-ce!14350</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' into layout-nav-es-module</title>
<updated>2017-12-20T10:25:09+00:00</updated>
<author>
<name>Filipa Lacerda</name>
<email>filipa@gitlab.com</email>
</author>
<published>2017-12-20T10:25:09+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=fd1811d36434df0d030ad7e35d595f1dd1bca5ea'/>
<id>fd1811d36434df0d030ad7e35d595f1dd1bca5ea</id>
<content type='text'>
* master: (21 commits)
  Prevent some specs from mangling the gitlab-shell checkout
  Line up search dropdown with other nav dropdowns
  Fix onion-skin re-entering state
  Remove related links in MR widget when empty state
  Show inline edit button for issues
  Fix tags in the Activity tab not being clickable
  Fix shortcut links on help page
  Don't link LFS-objects multiple times.
  [CE-&gt;EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb
  Tidy up the documentation of Gitlab HA/Gitlab Application
  Make sure two except won't overwrite each other
  Update axios.md
  Remove transitionend event from GL dropdown
  Preserve gem path so that we use the same gems
  Load commit in batches for pipelines#index
  BlobViewer::PackageJson - if private link to homepage
  Do not generate links for private NPM modules in blob view
  Remove block styling from search dropdown
  Fix sidebar height when performance bar enabled
  Remove all dropdown animations and set display: none if they're not open
  ...
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* master: (21 commits)
  Prevent some specs from mangling the gitlab-shell checkout
  Line up search dropdown with other nav dropdowns
  Fix onion-skin re-entering state
  Remove related links in MR widget when empty state
  Show inline edit button for issues
  Fix tags in the Activity tab not being clickable
  Fix shortcut links on help page
  Don't link LFS-objects multiple times.
  [CE-&gt;EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb
  Tidy up the documentation of Gitlab HA/Gitlab Application
  Make sure two except won't overwrite each other
  Update axios.md
  Remove transitionend event from GL dropdown
  Preserve gem path so that we use the same gems
  Load commit in batches for pipelines#index
  BlobViewer::PackageJson - if private link to homepage
  Do not generate links for private NPM modules in blob view
  Remove block styling from search dropdown
  Fix sidebar height when performance bar enabled
  Remove all dropdown animations and set display: none if they're not open
  ...
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '41186-sidebar-too-much-vertical-scroll' into 'master'</title>
<updated>2017-12-20T08:56:58+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2017-12-20T08:56:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=febb0b9a8014f5b480ff7baab1d189fce49210a5'/>
<id>febb0b9a8014f5b480ff7baab1d189fce49210a5</id>
<content type='text'>
Remove animations from dropdowns

Closes #41186

See merge request gitlab-org/gitlab-ce!15968</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Remove animations from dropdowns

Closes #41186

See merge request gitlab-org/gitlab-ce!15968</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'</title>
<updated>2017-12-20T08:37:32+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2017-12-20T08:37:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6e42fac3fb11c1c6143975dbe6c843a22cd4828f'/>
<id>6e42fac3fb11c1c6143975dbe6c843a22cd4828f</id>
<content type='text'>
Don't link LFS-objects multiple times.

Closes #41241

See merge request gitlab-org/gitlab-ce!16006</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Don't link LFS-objects multiple times.

Closes #41241

See merge request gitlab-org/gitlab-ce!16006</pre>
</div>
</content>
</entry>
<entry>
<title>Only include the user's ID in the time_spent command's update hash</title>
<updated>2017-12-19T21:45:08+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2017-12-14T19:32:55+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3e4b45fc216875ff25647675d92448a53a740d9b'/>
<id>3e4b45fc216875ff25647675d92448a53a740d9b</id>
<content type='text'>
Previously, this would include the entire User record in the update
hash, which was rendered in the response using `to_json`, erroneously
exposing every attribute of that record, including their (now removed)
private token.

Now we only include the user ID, and perform the lookup on-demand.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Previously, this would include the entire User record in the update
hash, which was rendered in the response using `to_json`, erroneously
exposing every attribute of that record, including their (now removed)
private token.

Now we only include the user ID, and perform the lookup on-demand.
</pre>
</div>
</content>
</entry>
<entry>
<title>Add a JsonSerializationError class instead of raising SecurityError</title>
<updated>2017-12-19T21:45:08+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2017-12-01T17:33:02+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8d0ad36bcfc0ef95ee9a116604ba1516367dbb27'/>
<id>8d0ad36bcfc0ef95ee9a116604ba1516367dbb27</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Use UserSerializer instead of `User.to_json`</title>
<updated>2017-12-19T21:45:08+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2017-09-19T18:22:43+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2f92238a6ea5550f94a4ece8453cbf6bdee1f77d'/>
<id>2f92238a6ea5550f94a4ece8453cbf6bdee1f77d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Accept arguments to blocked JSON serialization methods</title>
<updated>2017-12-19T21:45:07+00:00</updated>
<author>
<name>Robert Speicher</name>
<email>rspeicher@gmail.com</email>
</author>
<published>2017-09-19T18:19:37+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6f1df8dfaabfebeb5e9ffbd785f263314b817324'/>
<id>6f1df8dfaabfebeb5e9ffbd785f263314b817324</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
