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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mr	Kamil Trzcinski	2016-10-18	38	-218/+506
\|\
\| *	Merge branch 'fix/pipeline-settings-page' into 'master'	Kamil Trzciński	2016-10-18	3	-2/+4
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix save button on pipelines settings page ## What does this MR do? This MR fixes 'Save button' on pipeline settings page, which didn't change state to enabled after saving settings. ## 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 - [ ] All builds are passing ## What are the relevant issue numbers? Closes #23431 See merge request !6955
\| \| *	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 'retry-cancelled-pipelines' into 'master'	Kamil Trzciński	2016-10-18	3	-6/+21
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make cancelled pipelines being able to retry ## What does this MR do? Make cancelled pipelines being able to retry ## 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 ## What are the relevant issue numbers? Closes #23326 See merge request !6927
\| \| * \	Merge remote-tracking branch 'upstream/master' into retry-cancelled-pipelinesretry-cancelled-pipelines	Lin Jen-Shin	2016-10-18	88	-860/+2072
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (58 commits) Update endpoint to username validator change border color to variable Add todo for deprecated user routes and more information about deprecation to changelog Provide better error message to the user Apply better hierarchy to markdown headers and issue/mr titles Swapped button text manipulation outcomes for the toggle query Fixed find file keyboard navigation Update CHANGELOG for 8.12.7 Added download-button class and applied button margin Enable activerecord_sane_schema_dumper for test Updated logo from @luke Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 Fix Test Env (proper error handling when gitlab-shell is not clonned) Fix randomly crashing spinach test for merge request [Great spinach fix] Replace gsub with delete Remove carriage returns from commit description as summary is on a newline and will always include carriage returns Convert due_date_select.js filetype to es6. Stop directly parsing due_date with Date.parse, prefer parsing implicitly. Improve spec for pipeline metrics worker Add Pipeline metrics worker ...
\| \| * \| \|	Add CHANGELOG entry	Lin Jen-Shin	2016-10-17	1	-0/+1
\| \| \| \| \|
\| \| * \| \|	Make cancelled pipelines being able to retry	Lin Jen-Shin	2016-10-17	2	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #23326
\| * \| \| \|	Merge branch 'issue_19734_2' into 'master'	Sean McGivern	2016-10-18	21	-174/+398
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add visibility level to project repository implements #19734 See merge request !6396
\| \| * \ \ \	Merge branch 'master' into issue_19734_2	Phil Hughes	2016-10-18	53	-634/+1635
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Add visibility level to project repositoryissue_19734_2	Felipe Artur	2016-10-17	21	-174/+398
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'looser-time-in-specs' into 'master'	Douwe Maan	2016-10-18	8	-14/+27
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a be_like_time matcher and use it in specs ## What does this MR do? Introduces a be_like_time matcher and refactors existing code to use it ## Are there points in the code the reviewer needs to double check? A few sites use be_within(2.seconds) or 5.minutes - I didn't change those ## Why was this MR needed? A custom matcher helps to document that we need to compare times loosely, and keeps the fudge factor from being declared in multiple places. ## Screenshots (if relevant) ## 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? Related to !6935 See merge request !6936
\| \| * \| \| \|	Add a be_like_time matcher and use it in specs	Nick Thomas	2016-10-17	8	-14/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The amount of precision times have in databases is variable, so we need tolerances when comparing in specs. It's better to have the tolerance defined in one place than several.
\| * \| \| \| \|	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 two scenarios into one	Kamil Trzcinski	2016-10-18	1	-8/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix remaining offenses	Kamil Trzcinski	2016-10-18	2	-4/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add logical validation to gitlab-ci.yml	Kamil Trzcinski	2016-10-18	3	-1/+77
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add `stop!` to `environment`	Kamil Trzcinski	2016-10-18	3	-4/+50
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr	Kamil Trzcinski	2016-10-18	45	-587/+1561
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \|