<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/gitlab/gitlab-ce.git/app/controllers/projects/blob_controller.rb, branch diff-notes-refactor</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>Address feedback</title>
<updated>2017-02-07T00:06:46+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-02-07T00:06:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=9d7c5e75841eff48217487b3acda56cf265a2aef'/>
<id>9d7c5e75841eff48217487b3acda56cf265a2aef</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add feature specs</title>
<updated>2017-02-06T22:12:24+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-02-01T21:49:20+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=6edc8d50dcec3252fd5afa244f9ade2e062f920d'/>
<id>6edc8d50dcec3252fd5afa244f9ade2e062f920d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Improve performance of finding last deployed environment</title>
<updated>2017-02-06T22:12:24+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-01-31T00:26:40+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=c8b63a28afa811881b617546fe94a19378585a04'/>
<id>c8b63a28afa811881b617546fe94a19378585a04</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add 'View on [env]' link to blobs and individual files in diffs</title>
<updated>2017-02-06T22:12:23+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@selenight.nl</email>
</author>
<published>2017-01-29T19:38:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=27f2ca94181880861269a7ddc07ae0d50a656d35'/>
<id>27f2ca94181880861269a7ddc07ae0d50a656d35</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 'jej-22869' into 'security'</title>
<updated>2016-11-29T00:25:18+00:00</updated>
<author>
<name>Douwe Maan</name>
<email>douwe@gitlab.com</email>
</author>
<published>2016-11-07T17:09:22+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=742cee756bf39d93fe5c7f207f8a54143ae6a384'/>
<id>742cee756bf39d93fe5c7f207f8a54143ae6a384</id>
<content type='text'>
Fix information disclosure in `Projects::BlobController#update`

It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that.

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

https://gitlab.com/gitlab-org/gitlab-ce/issues/22869

See merge request !2023
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Fix information disclosure in `Projects::BlobController#update`

It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that.

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

https://gitlab.com/gitlab-org/gitlab-ce/issues/22869

See merge request !2023
</pre>
</div>
</content>
</entry>
<entry>
<title>Unify anchor link format for MR diff files !7298</title>
<updated>2016-11-15T17:51:21+00:00</updated>
<author>
<name>Yar</name>
<email>YarTheGreat@gmail.com</email>
</author>
<published>2016-11-13T18:18:03+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=8782bb96cca3ade2b367f588fd8332906dcc2d1b'/>
<id>8782bb96cca3ade2b367f588fd8332906dcc2d1b</id>
<content type='text'>
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit  allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.

Inspired by #24010 and !7298
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit  allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.

Inspired by #24010 and !7298
</pre>
</div>
</content>
</entry>
<entry>
<title>fixes distinction between renaming a file and updating its content and</title>
<updated>2016-09-10T03:05:30+00:00</updated>
<author>
<name>tiagonbotelho</name>
<email>tiagonbotelho@hotmail.com</email>
</author>
<published>2016-08-24T13:30:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=08dc8af7339828852ae8596aeea577f9551d399d'/>
<id>08dc8af7339828852ae8596aeea577f9551d399d</id>
<content type='text'>
refactors update file
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
refactors update file
</pre>
</div>
</content>
</entry>
<entry>
<title>Prevents accidental overwrites of commits from UI</title>
<updated>2016-08-15T02:34:55+00:00</updated>
<author>
<name>Frank West</name>
<email>frank.west.iii@gmail.com</email>
</author>
<published>2016-08-08T03:29:23+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=ade0c2c8922c0838ba85cf69419cbb109453d6b2'/>
<id>ade0c2c8922c0838ba85cf69419cbb109453d6b2</id>
<content type='text'>
Currently when a user performs an update of a file through the UI  and there
has already been a change committed to the file the previous commits will be
overwritten without a check to see if the file has been changed.

This commit uses the last commit sha at the time the user starts editing the
file and compares it with the current sha of the file being edited to ensure
they are the same before committing the file. If the shas do not match we
throw an exception preventing the commit from the commit from occurring.

Fixes #5857
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Currently when a user performs an update of a file through the UI  and there
has already been a change committed to the file the previous commits will be
overwritten without a check to see if the file has been changed.

This commit uses the last commit sha at the time the user starts editing the
file and compares it with the current sha of the file being edited to ensure
they are the same before committing the file. If the shas do not match we
throw an exception preventing the commit from the commit from occurring.

Fixes #5857
</pre>
</div>
</content>
</entry>
<entry>
<title>Add unfold links for Side-by-Side view</title>
<updated>2016-08-04T06:09:59+00:00</updated>
<author>
<name>Tim Masliuchenko</name>
<email>insside@gmail.com</email>
</author>
<published>2016-07-21T18:44:12+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=b6d545df51d7c3b4e572b40cdafb7efeb78edaf4'/>
<id>b6d545df51d7c3b4e572b40cdafb7efeb78edaf4</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>renames :file_name to :file_path</title>
<updated>2016-07-13T10:19:14+00:00</updated>
<author>
<name>tiagonbotelho</name>
<email>tiagonbotelho@hotmail.com</email>
</author>
<published>2016-07-13T10:19:14+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/gitlab/gitlab-ce.git/commit/?id=dd3addad481e7e0475cfecd16c8bcd3dc65e967d'/>
<id>dd3addad481e7e0475cfecd16c8bcd3dc65e967d</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
