delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move #to_discussion to NoteOnDiff21211-comment-on-diff-partially-broken-after-updating-to-8-11	Sean McGivern	2016-08-30	3	-8/+4
\|
*	Fix diff comments on legacy MRs	Sean McGivern	2016-08-30	1	-0/+4
\|
*	Merge branch '21275-getting-500-error-when-viewing-a-merge-request'	Douwe Maan	2016-08-25	1	-2/+6
\|\
\| *	Don't show conflicts when there are none	Sean McGivern	2016-08-25	1	-1/+5
\| \|
\| *	Handle case where conflicts aren't on disk yet	Sean McGivern	2016-08-25	1	-1/+1
\| \|
* \|	Merge branch 'statuseable-hasstatus' into 'master'	Robert Speicher	2016-08-25	3	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename Statuseable to HasStatus ## What does this MR do? - Rename all instances of Statuseable in the codebase, to HasStatus - Rename all files from statuseable to has_status ## What are the relevant issue numbers? Closes #21103 See merge request !6003
\| * \|	rename Statuseable to HasStatus	De Wet Blomerus	2016-08-25	3	-3/+3
\| \|/
* \|	Merge branch 'zj-remove-gitorious' into 'master'	Douwe Maan	2016-08-25	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitorious ## What does this MR do? Remove gitorious as import source ## Are there points in the code the reviewer needs to double check? Did I remove everything? ## Why was this MR needed? This button yielded a 404 ## What are the relevant issue numbers? Closes #17062 /cc @JobV See merge request !5866
\| * \|	Remove gitoriouszj-remove-gitorious	Z.J. van de Weg	2016-08-25	1	-1/+1
\| \|/
* \|	Merge branch 'dz-merge-request-version'	Douwe Maan	2016-08-25	2	-94/+135
\|\ \
\| * \|	Change the way merge request diff compare worksdz-merge-request-version	Dmitriy Zaporozhets	2016-08-25	1	-18/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remove ref fetch (we do it during creation anyway) * remove safe_head_commit_sha for diff compare (do not depend on the source branch) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Add code improvements to merge request version feature	Dmitriy Zaporozhets	2016-08-25	1	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add MergeRequestDiff#latest? * Remove unnecessary variable assignment Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Restore diff_sha_refs method	Dmitriy Zaporozhets	2016-08-22	2	-16/+21
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-22	23	-73/+181
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \ \	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-19	31	-51/+506
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Make sure merge request is fetched before collecting base sha in merge ↵	Dmitriy Zaporozhets	2016-08-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	request diff Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix and refactor merge request diff_refs method	Dmitriy Zaporozhets	2016-08-15	3	-21/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Make merge request diff works with new FileCollection logic	Dmitriy Zaporozhets	2016-08-15	2	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'master' into dz-merge-request-version	Dmitriy Zaporozhets	2016-08-15	25	-172/+406
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Fix merge request diff create and head_commit_sha compatibility	Dmitriy Zaporozhets	2016-08-15	1	-3/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Change the way old merge request diff handled	Dmitriy Zaporozhets	2016-08-15	2	-12/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Load merge request versions without loading whole diff from database	Dmitriy Zaporozhets	2016-08-09	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Add MergeRequest#branch_merge_base_commit method	Dmitriy Zaporozhets	2016-08-08	1	-8/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Build diff_refs for merge request if merge request diff does not exist	Dmitriy Zaporozhets	2016-08-02	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Fix creation and reload of the merge request diff	Dmitriy Zaporozhets	2016-08-02	1	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Chnage the way how merge request diff is initialized and saved	Dmitriy Zaporozhets	2016-08-02	2	-32/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Change merge request diff creation from callback to part of the service	Dmitriy Zaporozhets	2016-08-02	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Add more tests to merge_request_diff and improve initialize	Dmitriy Zaporozhets	2016-08-02	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Refactor MergeRequestDiff initialize method	Dmitriy Zaporozhets	2016-08-02	1	-16/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Reload merge request association reload when update code	Dmitriy Zaporozhets	2016-08-02	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Remove requirement for base_commit_sha to allow creation of merge requests ↵	Dmitriy Zaporozhets	2016-08-02	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for orphaned branches Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Add improvements to merge request versions	Dmitriy Zaporozhets	2016-08-02	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* show commits count in the merge request version dropdown * initialize base/start commit sha for old merge request diffs from repo Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Ensure merge request is created with valid diff object	Dmitriy Zaporozhets	2016-08-02	2	-20/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add merge_request_diff validation to merge_request model * Improve initialize of merge_request_diff object * Rename some merge_request_diff methods for clarity Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Refactor MergeRequestDiff model	Dmitriy Zaporozhets	2016-08-02	1	-15/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since MergeRequestDiff is not about branches and current state of merge request diff anymore I removed most of branch related method and added validation for head/start/base commit sha. From this point MergeRequestDiff is about saving diff between branches only once at moment of creation. Once created MergeRequestDiff should not be changes. Because of that we should not rely on changes in source/target branches when read from MergeRequestDiff Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Refactor merge request diff	Dmitriy Zaporozhets	2016-08-02	1	-51/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Add ability to render different merge request versions	Dmitriy Zaporozhets	2016-08-02	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Improve merge request diff creation and update tests	Dmitriy Zaporozhets	2016-08-02	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Create merge request diff on merge request creation	Dmitriy Zaporozhets	2016-08-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Create new version of merge request diff on push instead of updating ↵	Dmitriy Zaporozhets	2016-08-02	1	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	existing one Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch '13912-reduce-pipeline-db-queries' into 'master'	Yorick Peterse	2016-08-25	3	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce number of database queries on builds tab See merge request !5957
\| * \| \| \| \| \|	Reduce number of database queries on builds tab13912-reduce-pipeline-db-queries	Paco Guzman	2016-08-25	3	-2/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Display project icon from default branch	Hannes Rosenögger	2016-08-25	2	-1/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit makes sure that the project icon is being read from the default branch instead of 'master'
* \| \| \| \|	Merge branch 'github-importer' into 'master'	Douwe Maan	2016-08-24	1	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Does not halt the GitHub import process when an error occurs ## What are the relevant issue numbers? Fixes #20385 https://gitlab.com/gitlab-org/gitlab-ce/issues/20149 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5763
\| * \| \| \| \|	Does not halt the GitHub import process when an error occurs	Douglas Barbosa Alexandre	2016-08-24	1	-2/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Show "Create Merge Request" widget for push events to fork projects on the ↵	Paco Guzman	2016-08-24	1	-2/+2
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	source project
* \| \| \| \|	Also check if Akismet is enabled, before showing the `Submit as spam` button.fix-spam-submit-button	Patricio Cano	2016-08-22	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Revert the revert of Optimistic Lockingrevert_revert_issuable_lock	Valery Sizov	2016-08-22	1	-0/+6
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Fix Error 500 resulting when loading network graphfix-network-graph-error-500	Stan Hu	2016-08-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`discussion_id` may not be present when the SELECT call for notes does not include this attribute. Don't attempt to set the discussion ID unless the model contains the attribute. Closes #21119, #21128
* \| \| \|	Make Ability#project_abilities return unique values and fix countsfix-rspec-failures-due-to-cached-permissions	Stan Hu	2016-08-20	1	-1/+1
\| \| \| \|
* \| \| \|	Fix assorted rspec failures due to stale, cached user permissions	Stan Hu	2016-08-20	1	-21/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RequestStore is disabled in tests, but the Ability class was caching user permissions based on the user and project ID of previous test runs. Revise code to use RequestStore only if it is active.