summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Added dyanmic position adjustment22089-show-full-job-name-on-hover-on-pipeline-graphLuke Bennett2016-10-192-15/+10
| | | | | | | | Added tooltips for dropdown items Reverted pretty much everything in favour of a DOM approach Simplified JS
* Added tooltip with jobs full name to build items in graphLuke Bennett2016-10-181-0/+11
| | | | | | | | Added status to build tooltip and removed status icon tooltip Added Pipelines class to force tooltips ontop of the dropdown, we cannot do this with data attributes because dropdown toggle is already set Corrected dispatcher invocation
* Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1814-432/+768
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-174-108/+175
| |\
| * \ Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1770-458/+1649
| |\ \
| * | | Add syntax highlighting to filesAlfredo Sumaran2016-10-131-0/+1
| | | |
| * | | Use plain JS to get elements and data and valuesAlfredo Sumaran2016-10-131-5/+5
| | | |
| * | | Remove unused filesAlfredo Sumaran2016-10-132-550/+0
| | | |
| * | | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-132-2/+4
| | | |
| * | | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-138-10/+93
| | | |
| * | | Use .some instead of .find for phantomjs compatibilityAlfredo Sumaran2016-10-131-9/+1
| | | |
| * | | Do not show Diff view switcher if all files are can be only resolved with an ↵Alfredo Sumaran2016-10-132-1/+14
| | | | | | | | | | | | | | | | editor
| * | | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-132-133/+150
| | | |
| * | | Refactor JS codeAlfredo Sumaran2016-10-135-4/+537
| | | | | | | | | | | | | | | | | | | | | | | | - Use a store base object to manage application state. - Add a service to handle ajax requests. - Load code only when needed
| * | | check if files is set before countingAlfredo Sumaran2016-10-131-0/+4
| | | |
| * | | Replace loading text with spinnerAlfredo Sumaran2016-10-131-2/+2
| | | |
| * | | Style for resolve conflicts formAlfredo Sumaran2016-10-131-0/+4
| | | |
| * | | Styles for discard alertAlfredo Sumaran2016-10-132-3/+14
| | | |
| * | | Replace textarea with Ace editorAlfredo Sumaran2016-10-132-7/+27
| | | |
| * | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-134-54/+260
| | | |
* | | | 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 'find-file-enter-fix' into 'master' Fatih Acet2016-10-171-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed find file keyboard navigation ## What does this MR do? The code to view a file on find file page was removed, this adds that back in & adds some tests. ## What are the relevant issue numbers? Closes #23423 See merge request !6944
| * | | | Fixed find file keyboard navigationfind-file-enter-fixPhil Hughes2016-10-171-0/+9
| |/ / / | | | | | | | | | | | | Closes #23423
* | | | Added download-button class and applied button margin23380-no-space-between-buttons-on-files-pageLuke Bennett2016-10-171-0/+4
|/ / /
* | | Merge branch 'safari-is-baNaNas' into 'master' Rémy Coutable2016-10-173-108/+162
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Safari displaying NaN for selected due date ## What does this MR do? 1. Stops using `Date.parse` to parse selected due dates. 2. Refactors DueDateSelectors to be more maintainable and readable ## Are there points in the code the reviewer needs to double check? **To review the actual fix, look here:** https://gitlab.com/gitlab-org/gitlab-ce/commit/4ad43ac3a12902d7ea01dc09f8a361b01c21a0ee. It would be difficult to pick out from the overall diff. ## Why was this MR needed? In Safari, the due date selector was displaying 'NaN' when a date is selected, which was being returned by `Date.parse`. Because `Date.parse` is implemented differently across browsers it's generally recommended to favor implicit Date parsing with the `Date` constructor. For more background on this, [see MDN on Date.parse](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Date/parse). Also, the code for DueDateSelector was pretty messy, and its logic was very tightly coupled, so I refactored it. None of the basic logic changed, I just broke it up into smaller pieces and made it more OO. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22984 See merge request !6797
| * | | Convert due_date_select.js filetype to es6.safari-is-baNaNasBryce Johnson2016-10-173-108/+162
| | | |
| * | | Stop directly parsing due_date with Date.parse, prefer parsing implicitly.Bryce Johnson2016-10-171-2/+2
| | |/ | |/|
* | | Merge branch 'ebraminio/gitlab-ce-master' into 'master'Robert Speicher2016-10-171-0/+13
|\ \ \ | |/ / |/| | | | | | | | | | | Add RTL support to Markdown rendering See merge request !6296
| * | Add RTL support to markdown rendererEbrahim Byagowi2016-10-161-0/+13
| | |
* | | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-161-1/+12
|/ /
* | Fix broken SCSS linter errors due to missing newlinesStan Hu2016-10-151-0/+3
| |
* | Revert "Improve tabbing usability for sign in page"login-ui-improvementsBryce Johnson2016-10-151-10/+0
| | | | | | | | This reverts commit 8751491b8db471dc661daa19bc82a9dbd58e4aae.
* | Back off the array spreading, bc poltergeist freaks out.Bryce Johnson2016-10-151-4/+3
| |
* | Convert dispatcher to es6.Bryce Johnson2016-10-151-0/+0
| |
* | Fixup invalid refs.Bryce Johnson2016-10-152-2/+2
| |
* | Convert field error NodeList to an Array.Bryce Johnson2016-10-151-2/+2
| |
* | Use native dom in dispatcher field error init.Bryce Johnson2016-10-151-3/+4
| |
* | Improve method naming in gl_field_errors.Bryce Johnson2016-10-151-21/+22
| |
* | Add accessor for current val for convenience.Bryce Johnson2016-10-151-5/+9
| |
* | Safely scope siblings of validated input.Bryce Johnson2016-10-151-2/+15
| |
* | Remove superfluous comment.Bryce Johnson2016-10-151-1/+0
| |
* | Prevent unneccessary loading of UsernameValidator.Bryce Johnson2016-10-151-1/+0
| |
* | Properly implement focus on first invalid.Bryce Johnson2016-10-151-11/+6
| |
View Lorry Controller Status