summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-1888-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 ...
| * Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1844-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-2Alfredo Sumaran2016-10-171-1/+1
| | |
| | * Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-1721-150/+317
| | |\
| | * \ Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-17246-1531/+3847
| | |\ \
| | * | | Update CHANGELOGAlfredo Sumaran2016-10-131-1/+0
| | | | |
| | * | | Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
| | | | |
| | * | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-133-0/+17
| | | | |
| | * | | Fix discard messageAlfredo Sumaran2016-10-131-1/+1
| | | | |
| | * | | Update CHANGELOGAlfredo Sumaran2016-10-131-0/+2
| | | | |
| | * | | Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
| | | | |
| | * | | Remove unused filesAlfredo Sumaran2016-10-132-550/+0
| | | | |
| | * | | Fix column limit on mysqlAlfredo Sumaran2016-10-131-1/+1
| | | | |
| | * | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-134-51/+101
| | | | |
| | * | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-1317-76/+140
| | | | |
| | * | | Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
| | | | |
| | * | | Improve diff view switching and componentsAlfredo Sumaran2016-10-136-61/+54
| | | | |
| | * | | Do not show Diff view switcher if all files are can be only resolved with an ↵Alfredo Sumaran2016-10-133-2/+15
| | | | | | | | | | | | | | | | | | | | editor
| | * | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-137-159/+213
| | | | |
| | * | | Refactor JS codeAlfredo Sumaran2016-10-1310-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 specSean McGivern2016-10-131-0/+1
| | | | |
| | * | | Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran2016-10-131-0/+26
| | | | |
| | * | | check if files is set before countingAlfredo Sumaran2016-10-131-0/+4
| | | | |
| | * | | Replace loading text with spinnerAlfredo Sumaran2016-10-132-3/+4
| | | | |
| | * | | Style for resolve conflicts formAlfredo Sumaran2016-10-132-10/+21
| | | | |
| | * | | Styles for discard alertAlfredo Sumaran2016-10-133-6/+18
| | | | |
| | * | | Replace textarea with Ace editorAlfredo Sumaran2016-10-134-8/+30
| | | | |
| | * | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-1311-73/+300
| | | | |
| | * | | We now support resolving conflicts with ambiguous markersDouwe Maan2016-10-131-1/+0
| | | | |
| | * | | Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
| | | | |
| | * | | Add JSON SchemaSean McGivern2016-10-132-0/+141
| | | | |
| | * | | Fix resolve service specsSean McGivern2016-10-131-2/+2
| | | | |
| | * | | Fix MR model specSean McGivern2016-10-131-6/+6
| | | | |
| | * | | Fix specsSean McGivern2016-10-132-4/+4
| | | | |
| | * | | Make RuboCop happySean McGivern2016-10-131-1/+0
| | | | |
| | * | | Allow setting content for resolutionsSean McGivern2016-10-1311-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 classesSean McGivern2016-10-131-0/+1
| | | | |
| * | | | Merge branch 'fix-username-validator-endpoint' into 'master' Stan Hu2016-10-171-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 validatorAlfredo Sumaran2016-10-171-1/+1
| | | | | |
| * | | | | Merge branch '21395-standarize-markdown-headlines' into 'master' Annabel Dunstone Gray2016-10-173-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
| | * | | | change border color to variabletauriedavis2016-10-172-4/+4
| | | | | |
| | * | | | Apply better hierarchy to markdown headers and issue/mr titles21395-standarize-markdown-headlinestauriedavis2016-10-173-21/+14
| | | | | |
| * | | | | Merge branch '23358-expand-hide-pipeline-btn-text-doesn-t-match' into 'master' Fatih Acet2016-10-171-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix toggling of expand/hide pipeline graph button ## What does this MR do? Corrects the toggling behaviour given that the pipeline graph now starts in a different state. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Expand/hide toggling UI is buggyyy ## Screenshots (if relevant) ![2016-10-14_18.15.41](/uploads/7cdeef02c0b8aa4266f2878866e4b633/2016-10-14_18.15.41.gif) ## 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 #23358 See merge request !6898
| | * | | | | Swapped button text manipulation outcomes for the toggle queryLuke Bennett2016-10-171-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'dz-rename-user-routes' into 'master'Robert Speicher2016-10-1717-98/+116
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename users routing from /u/:username to /users/:username for consistency with other routes Renames /u/:username to /users/:username To follow consistency with other routes (like groups) and UsersController name. Now when you can use `/:username` for accessing user page there is no need in shortcut like `/u/` See merge request !6851
| | * | | | Add todo for deprecated user routes and more information about deprecation ↵dz-rename-user-routesDmitriy Zaporozhets2016-10-172-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to changelog Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add user routing rename to CHANGELOGDmitriy Zaporozhets2016-10-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Remove /u/ prefix from user pages in documentationDmitriy Zaporozhets2016-10-1313-87/+87
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Update users routing specDmitriy Zaporozhets2016-10-132-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Rename users routing from /u/:username to /users/:username for consistency ↵Dmitriy Zaporozhets2016-10-121-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with other routes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status