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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Changelog entry for pipeline settings button fixfix/pipeline-settings-page	Grzegorz Bizon	2016-10-18	1	-0/+1
\|
*	Move specs for project pipeline settings page	Grzegorz Bizon	2016-10-18	1	-0/+0
\|
*	Reload pipeline settings when saving new settings	Grzegorz Bizon	2016-10-18	2	-2/+3
\|
*	Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master'	Sean McGivern	2016-10-18	3	-5/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the diff in the merge request view when converting a symlink to a regular file ## What does this MR do? It fixes a bug described in #21610 ## Why was this MR needed? There was a regression introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/cd7c2cb6ddd4d9c9f9bdae00c887c0022c121c17 ## 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 [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] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #21610 See merge request !6828
\| *	Fix the diff in the merge request view when converting a symlink to a ↵adam-fix-mr-diff-symlink-file-conversion	Adam Niedzielski	2016-10-17	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	regular file. In this specific case using file_path as a cache key is not enough, because there are two entries with the same path. Closes #21610.
* \|	Merge branch 'faster_toggle_award_url_helper_method' into 'master'	Yorick Peterse	2016-10-18	2	-3/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Execute specific named route method from toggle_award_url helper method See merge request !6848
\| * \|	Execute specific named route method from toggle_award_url helper methodfaster_toggle_award_url_helper_method	Paco Guzman	2016-10-18	2	-3/+7
\| \| \|
* \| \|	Merge branch 'fix/build-erase-race-condition' into 'master'	Kamil Trzciński	2016-10-18	3	-15/+40
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid race condition when expiring artifacts ## What does this MR do? It may happen that job which purpose is to remove expired artifacts will be executed asynchronously when, in the meantime, project associated with given build gets removed by another async job. In that case we should not remove artifacts because such build will be eventually removed anyway along with artifacts, when project removal is complete. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #22296 See merge request !6881
\| * \|	Fix Changelog entry for fix to CI artifacts erase	Grzegorz Bizon	2016-10-18	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Add Changelog entry to fix for removing artifactsfix/build-erase-race-condition	Grzegorz Bizon	2016-10-17	1	-0/+2
\| \| \|
\| * \|	Avoid race condition when expiring artifacts	Grzegorz Bizon	2016-10-17	2	-15/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It may happen that job meant to remove expired artifacts will be executed asynchronously when, in the meantime, project associated with given build gets removed by another asynchronous job. In that case we should not remove artifacts because such build will be removed anyway, when project removal is complete.
* \| \|	Merge branch 'merge-conflicts-editor-2' into 'master'	Jacob Schatz	2016-10-18	44	-586/+1560
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve Merge conflicts in editor ## What does this MR do? This is the second iteration of https://gitlab.com/gitlab-org/gitlab-ce/issues/20344 which now allows to resolve conflicts manually providing an editor to the user. ## Are there points in the code the reviewer needs to double check? - Previous implementation has been refactored almost from the ground up. - Also some components like `parallel-conflict-lines` has been optimized to work well with PhantomJS. - The app and files required files are loaded only when needed. `merge_conflicts_bundle.js` is only loaded in `/<group>/<project>/merge_requests/<Id>/conflicts` only ## Why was this MR needed? Some MRs were unable to be solved interactively in the UI, with this MR we let the user to manually fix complex merge request conflicts. ## Screenshots (if relevant) <img src="/uploads/33a016f025bd590b1fc6eeee1ee11626/Screen_Shot_2016-09-19_at_1.39.39_PM.png" width="800"> ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20344, https://gitlab.com/gitlab-org/gitlab-ce/issues/3567. See merge request !6374
\| * \| \|	Provide better error message to the usermerge-conflicts-editor-2	Alfredo Sumaran	2016-10-17	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into merge-conflicts-editor-2	Alfredo Sumaran	2016-10-17	21	-150/+317
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'master' into merge-conflicts-editor-2	Sean McGivern	2016-10-17	246	-1531/+3847
\| \|\ \ \
\| * \| \| \|	Update CHANGELOG	Alfredo Sumaran	2016-10-13	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Add syntax highlighting to files	Alfredo Sumaran	2016-10-13	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add blob_ace_mode to conflict content response	Sean McGivern	2016-10-13	3	-0/+17
\| \| \| \| \|
\| * \| \| \|	Fix discard message	Alfredo Sumaran	2016-10-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Update CHANGELOG	Alfredo Sumaran	2016-10-13	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Use plain JS to get elements and data and values	Alfredo Sumaran	2016-10-13	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Remove unused files	Alfredo Sumaran	2016-10-13	2	-550/+0
\| \| \| \| \|
\| * \| \| \|	Fix column limit on mysql	Alfredo Sumaran	2016-10-13	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add more tests to check conflicts resolution	Alfredo Sumaran	2016-10-13	4	-51/+101
\| \| \| \| \|
\| * \| \| \|	Improve components for PhantomJs compatibility	Alfredo Sumaran	2016-10-13	17	-76/+140
\| \| \| \| \|
\| * \| \| \|	Use .some instead of .find for phantomjs compatibility	Alfredo Sumaran	2016-10-13	1	-9/+1
\| \| \| \| \|
\| * \| \| \|	Improve diff view switching and components	Alfredo Sumaran	2016-10-13	6	-61/+54
\| \| \| \| \|
\| * \| \| \|	Do not show Diff view switcher if all files are can be only resolved with an ↵	Alfredo Sumaran	2016-10-13	3	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	editor
\| * \| \| \|	Ability to resolve conflicts for files with `text-editor` as conflict type	Alfredo Sumaran	2016-10-13	7	-159/+213
\| \| \| \| \|
\| * \| \| \|	Refactor JS code	Alfredo Sumaran	2016-10-13	10	-11/+545
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed
\| * \| \| \|	Fix editor spec	Sean McGivern	2016-10-13	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add tests to check if files are resolved with Edit Inline mode	Alfredo Sumaran	2016-10-13	1	-0/+26
\| \| \| \| \|
\| * \| \| \|	check if files is set before counting	Alfredo Sumaran	2016-10-13	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Replace loading text with spinner	Alfredo Sumaran	2016-10-13	2	-3/+4
\| \| \| \| \|
\| * \| \| \|	Style for resolve conflicts form	Alfredo Sumaran	2016-10-13	2	-10/+21
\| \| \| \| \|
\| * \| \| \|	Styles for discard alert	Alfredo Sumaran	2016-10-13	3	-6/+18
\| \| \| \| \|
\| * \| \| \|	Replace textarea with Ace editor	Alfredo Sumaran	2016-10-13	4	-8/+30
\| \| \| \| \|
\| * \| \| \|	Implement editor to manually resolve merge conflicts	Alfredo Sumaran	2016-10-13	11	-73/+300
\| \| \| \| \|
\| * \| \| \|	We now support resolving conflicts with ambiguous markers	Douwe Maan	2016-10-13	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Simplify conflict file JSON creation	Sean McGivern	2016-10-13	1	-7/+15
\| \| \| \| \|
\| * \| \| \|	Add JSON Schema	Sean McGivern	2016-10-13	2	-0/+141
\| \| \| \| \|
\| * \| \| \|	Fix resolve service specs	Sean McGivern	2016-10-13	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix MR model spec	Sean McGivern	2016-10-13	1	-6/+6
\| \| \| \| \|
\| * \| \| \|	Fix specs	Sean McGivern	2016-10-13	2	-4/+4
\| \| \| \| \|
\| * \| \| \|	Make RuboCop happy	Sean McGivern	2016-10-13	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Allow setting content for resolutions	Sean McGivern	2016-10-13	11	-42/+395
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When reading conflicts: 1. Add a `type` field. `text` works as before, and has `sections`; `text-editor` is a file with ambiguous conflict markers that can only be resolved in an editor. 2. Add a `content_path` field pointing to a JSON representation of the file's content for a single file. 3. Hitting `content_path` returns a similar datastructure to the `file`, but without the `content_path` and `sections` fields, and with a `content` field containing the full contents of the file (with conflict markers). When writing conflicts: 1. Instead of `sections` being at the top level, they are now in a `files` array. This matches the read format better. 2. The `files` array contains file hashes, each of which must contain: a. `new_path` b. `old_path` c. EITHER `sections` (which works as before) or `content` (with the full content of the resolved file).
\| * \| \| \|	Add instrumentation to conflict classes	Sean McGivern	2016-10-13	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-username-validator-endpoint' into 'master'	Stan Hu	2016-10-17	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes endpoint to username validator Fixes failing specs on master. Introduced here https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6328 See merge request !6951
\| * \| \| \| \|	Update endpoint to username validator	Alfredo Sumaran	2016-10-17	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '21395-standarize-markdown-headlines' into 'master'	Annabel Dunstone Gray	2016-10-17	3	-24/+17
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply better hierarchy to markdown headers and issue/mr titles ## What does this MR do? Applies better hierarchy to markdown headers and issue/mr titles ## Why was this MR needed? Titles of issues/mr's were smaller than h1, leading to strange hierarchy when reading descriptions ## Screenshots (if relevant) ### Before: ![Screen_Shot_2016-10-14_at_1.31.37_PM](/uploads/79b6b16b8ed1b3b49578161eea1f0e42/Screen_Shot_2016-10-14_at_1.31.37_PM.png) ### After: ![Screen_Shot_2016-10-14_at_1.31.26_PM](/uploads/f710b63c112e342c5429810984079da6/Screen_Shot_2016-10-14_at_1.31.26_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21395 See merge request !6904