<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/views/projects/diffs/_warning.html.haml, branch sql-guide</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>Use Gitlab::Git::DiffCollections</title>
<updated>2016-03-03T17:38:44+00:00</updated>
<author>
<name>Jacob Vosmaer</name>
<email>contact@jacobvosmaer.nl</email>
</author>
<published>2016-03-03T17:38:44+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1764e1b7cb2bffb9b4c4a69991fe2c4d21ce5459'/>
<id>1764e1b7cb2bffb9b4c4a69991fe2c4d21ce5459</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Changed too many changes buttons to white</title>
<updated>2016-02-29T09:18:29+00:00</updated>
<author>
<name>Phil Hughes</name>
<email>me@iamphill.com</email>
</author>
<published>2016-02-29T09:18:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=2f0c3ca35242045f889816bc16fdb8577830b831'/>
<id>2f0c3ca35242045f889816bc16fdb8577830b831</id>
<content type='text'>
Closes #13751
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Closes #13751
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix "Reload with full diff" URL button in compare branch view</title>
<updated>2015-08-25T06:35:26+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2015-08-25T06:35:26+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3bee4a6712a654abeba4ce07eb17235c3240b487'/>
<id>3bee4a6712a654abeba4ce07eb17235c3240b487</id>
<content type='text'>
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix the "Reload with full diff" URL button</title>
<updated>2015-07-23T19:53:54+00:00</updated>
<author>
<name>Stan Hu</name>
<email>stanhu@gmail.com</email>
</author>
<published>2015-07-22T00:37:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ae3f869fd1f4326e26805606197dea4ea15c67bb'/>
<id>ae3f869fd1f4326e26805606197dea4ea15c67bb</id>
<content type='text'>
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.

Closes #2041
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.

Closes #2041
</pre>
</div>
</content>
</entry>
<entry>
<title>Detail too many warning to explain that merge will still work.</title>
<updated>2015-07-06T20:03:36+00:00</updated>
<author>
<name>Sytse Sijbrandij</name>
<email>sytse@gitlab.com</email>
</author>
<published>2015-07-06T20:03:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=5ee8ae4894fd39c404ae035c623217143ef42849'/>
<id>5ee8ae4894fd39c404ae035c623217143ef42849</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Improve handling of large diffs</title>
<updated>2015-05-05T16:51:12+00:00</updated>
<author>
<name>Alex Lossent</name>
<email>alexandre.lossent@cern.ch</email>
</author>
<published>2015-04-27T16:06:51+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=affd049dc4427d749b97eaee37a5d54873016657'/>
<id>affd049dc4427d749b97eaee37a5d54873016657</id>
<content type='text'>
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
</pre>
</div>
</content>
</entry>
<entry>
<title>Refactor buttons</title>
<updated>2015-03-14T07:29:32+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-03-14T07:29:32+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=30ca451fd4f926998868b9db524e8fa98cd9457d'/>
<id>30ca451fd4f926998868b9db524e8fa98cd9457d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Replace bs-callout with alert</title>
<updated>2015-03-07T02:36:22+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-03-07T02:36:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=3bfd53149c2791b1598f3fc14e37cd33b7aef2d5'/>
<id>3bfd53149c2791b1598f3fc14e37cd33b7aef2d5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Introduce shortcuts for routing helpers</title>
<updated>2015-02-26T03:34:16+00:00</updated>
<author>
<name>Dmitriy Zaporozhets</name>
<email>dmitriy.zaporozhets@gmail.com</email>
</author>
<published>2015-02-26T03:34:16+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=1da71cc520dd09098d8f756de3f58b8e2f153fcd'/>
<id>1da71cc520dd09098d8f756de3f58b8e2f153fcd</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 'master' into rails-4.1.9</title>
<updated>2015-02-20T03:53:05+00:00</updated>
<author>
<name>Vinnie Okada</name>
<email>vokada@mrvinn.com</email>
</author>
<published>2015-02-20T03:53:05+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9e9ce95d62ec4feb76c3ec238dd3189c781f40ce'/>
<id>9e9ce95d62ec4feb76c3ec238dd3189c781f40ce</id>
<content type='text'>
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
</pre>
</div>
</content>
</entry>
</feed>
