gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2017-02-02	Active tense test coverage	Valery Sizov
	Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE
2016-12-09	Merge branch 'html-safe-diff-line-content' into 'security'	Robert Speicher
	Don't accidentally mark unsafe diff lines as HTML safe Fixes potential XSS issue when a legacy diff note is created on a merge request whose diff contained HTML See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249 See merge request !2040
2016-11-04	Remove an extra leading space from diff content	Hiroyuki Sato

2016-08-09	adds second batch of tests changed to active tense	tiagonbotelho

2016-08-09	fixes part1 of files to start using active tense	tiagonbotelho

2016-08-04	Add unfold links for Side-by-Side view	Tim Masliuchenko

2016-08-03	switch from diff_file_collection to diffs	Paco Guzman
	So we have raw_diffs too
2016-07-18	Collapsed diffs lines/size don't accumulate to overflow diffs.	Paco Guzman

2016-07-12	Merge branch 'master' into faster-diffs	Jacob Schatz

2016-07-08	Disable overflow messages	Sean McGivern
	With the option to expand and collapse individual diffs, these aren't needed any more.
2016-07-08	Merge branch 'master' into faster-diffs	Douwe Maan
	# Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb
2016-07-07	Represent DiffRefs as proper class instead of tuple array	Douwe Maan

2016-07-06	fix up tests	Luke "Jared" Bennett
	Added more exceptions Added handling inline view type
2016-05-18	Create DiffFilter and change SystemNoteService#change_title to use ↵	Adam Butler
	Gitlab::Diff::InlineDiff
2016-04-15	Always read diff_view setting from the cookie	Robert Speicher
	Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
2016-03-03	Use Gitlab::Git::DiffCollections	Jacob Vosmaer

2016-01-30	Fix specs and add a new one	Douwe Maan

2016-01-20	Move parallel diff logic to separate class	Douwe Maan

2016-01-15	More refactoring from last code review. #3945	Rubén Dávila
	* Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
2016-01-09	Fix broken specs. #3945	Rubén Dávila

2016-01-09	Fix broken specs. #3945	Rubén Dávila

2015-12-31	Fix broken spec and small refactor. #3945	Rubén Dávila

2015-06-22	Update mock and stub syntax for specs	Robert Speicher

2015-05-21	Disabled expansion of top/bottom blobs for new file diffs	Alex Connor

2015-05-05	Improve handling of large diffs	Alex Lossent
	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.
2015-04-24	Use project.commit convenience method.	Douwe Maan

2015-02-12	Even more hound fixes	Jeroen van Baarsen
	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12	Updated rspec to rspec 3.x syntax	Jeroen van Baarsen
	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-09-12	Fix diff_helper spec.	Marin Jankovski

2014-09-09	Add diff_helper spec.	Marin Jankovski