<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/db, branch fix/encoding-binary-issue</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 'fix-realtime-edited-text-for-issues-9-3' into 'master'</title>
<updated>2017-06-05T10:42:33+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2017-06-05T10:42:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c34107608ecc5c36e80a748eb4c9b88d2b1157cf'/>
<id>c34107608ecc5c36e80a748eb4c9b88d2b1157cf</id>
<content type='text'>
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

See merge request !11478</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.

See merge request !11478</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'sidekiq-transaction' into 'master'</title>
<updated>2017-06-05T09:34:05+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2017-06-05T09:34:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3cc5e48668caf97588241001866fd42666b2f8f0'/>
<id>3cc5e48668caf97588241001866fd42666b2f8f0</id>
<content type='text'>
Forbid Sidekiq scheduling in transactions

Closes #27233

See merge request !9376</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Forbid Sidekiq scheduling in transactions

Closes #27233

See merge request !9376</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '30469-convdev-index' into 'master'</title>
<updated>2017-06-05T09:18:12+00:00</updated>
<author>
<name>Sean McGivern</name>
<email>sean@mcgivern.me.uk</email>
</author>
<published>2017-06-05T09:18:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3b39cf4e0c5d0ca680a40bb7232fee4f7fdfb02e'/>
<id>3b39cf4e0c5d0ca680a40bb7232fee4f7fdfb02e</id>
<content type='text'>
ConvDev Index

Closes #30469

See merge request !11377</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
ConvDev Index

Closes #30469

See merge request !11377</pre>
</div>
</content>
</entry>
<entry>
<title>Fix keys seed</title>
<updated>2017-06-02T17:37:57+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-06-02T17:12:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=103b5bf60ba952e661b3e22d866cc64eed7358ee'/>
<id>103b5bf60ba952e661b3e22d866cc64eed7358ee</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix up merge issues</title>
<updated>2017-06-02T16:30:58+00:00</updated>
<author>
<name>Luke "Jared" Bennett</name>
<email>lbennett@gitlab.com</email>
</author>
<published>2017-06-02T16:30:58+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b2d577a7a293ac6c82a8bc64f5b134558460df5b'/>
<id>b2d577a7a293ac6c82a8bc64f5b134558460df5b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Make sure that environment was created before deploying</title>
<updated>2017-06-02T13:34:31+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2017-06-02T13:00:56+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=4968f226a0730de12c5f50b23e8e08360d906c3d'/>
<id>4968f226a0730de12c5f50b23e8e08360d906c3d</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 'upstream/master' into 25680-CI_ENVIRONMENT_URL</title>
<updated>2017-06-01T20:24:57+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2017-06-01T20:24:57+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b01bc0a0362fdc81f61941bee3b090267b6873c1'/>
<id>b01bc0a0362fdc81f61941bee3b090267b6873c1</id>
<content type='text'>
* upstream/master: (39 commits)
  Resolve "Improve Container Registry description"
  Add username parameter to gravatar URL
  Fix replying to a commit discussion displayed in the context of an MR
  Add fog-aliyun as backup storage provider
  Add missing specs
  Make sure protected can't be null; Test protected!
  Update session cookie key name to be unique to instance in development
  Just mention which GitLab version is required
  Fix data inconsistency issue for old artifacts by moving them to a currently used path
  Fix N+1 queries for non-members in comment threads
  Fix rubocop in spec/helpers/diff_helper_spec.rb
  Merge two items into one in the doc
  Only remove FK if it exists
  Maintain notes avatar at smaller breakpoint
  Fix pipeline schedule value name in documentation
  Add test for Project#protected_for?
  Update diff discussion position per discussion instead of per note
  Display Shared Runner status in Admin Dashboard
  Make sure we're loading the fresh variables
  Now secret_variables_for would return the variables
  ...
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* upstream/master: (39 commits)
  Resolve "Improve Container Registry description"
  Add username parameter to gravatar URL
  Fix replying to a commit discussion displayed in the context of an MR
  Add fog-aliyun as backup storage provider
  Add missing specs
  Make sure protected can't be null; Test protected!
  Update session cookie key name to be unique to instance in development
  Just mention which GitLab version is required
  Fix data inconsistency issue for old artifacts by moving them to a currently used path
  Fix N+1 queries for non-members in comment threads
  Fix rubocop in spec/helpers/diff_helper_spec.rb
  Merge two items into one in the doc
  Only remove FK if it exists
  Maintain notes avatar at smaller breakpoint
  Fix pipeline schedule value name in documentation
  Add test for Project#protected_for?
  Update diff discussion position per discussion instead of per note
  Display Shared Runner status in Admin Dashboard
  Make sure we're loading the fresh variables
  Now secret_variables_for would return the variables
  ...
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix other use of CreateDeploymentService and make</title>
<updated>2017-06-01T18:46:34+00:00</updated>
<author>
<name>Lin Jen-Shin</name>
<email>godfat@godfat.org</email>
</author>
<published>2017-06-01T18:46:34+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=f62603286d72d42e5b4e87b8f7f7bd6094407f1b'/>
<id>f62603286d72d42e5b4e87b8f7f7bd6094407f1b</id>
<content type='text'>
it a bit more robust against missing options,
which we did guard on for some cases.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
it a bit more robust against missing options,
which we did guard on for some cases.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch '24196-protected-variables' into 'master'</title>
<updated>2017-06-01T17:18:03+00:00</updated>
<author>
<name>Kamil Trzciński</name>
<email>ayufan@ayufan.eu</email>
</author>
<published>2017-06-01T17:18:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=950db1bd6472813bb539b69a309402c4eb115122'/>
<id>950db1bd6472813bb539b69a309402c4eb115122</id>
<content type='text'>
Implementation for protected variables

Closes #24196

See merge request !11688</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Implementation for protected variables

Closes #24196

See merge request !11688</pre>
</div>
</content>
</entry>
<entry>
<title>Add Conversational Development Index page to admin panel</title>
<updated>2017-06-01T15:37:21+00:00</updated>
<author>
<name>Taurie Davis, Simon Knox and Adam Niedzielski</name>
<email>awesome@gitlab.com</email>
</author>
<published>2017-05-24T10:25:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=26dde5f55f1dac2e6bea4f7e1dfa51c72dc756cb'/>
<id>26dde5f55f1dac2e6bea4f7e1dfa51c72dc756cb</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
