summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-241-2/+3
| | | | | | | | | | | | | | | | - Disable {project, group} members submit button if no users If no users are selected, the submit button should be disabled. - Alert user when no users were added to {project, group}. When no users were selected for adding, an alert message is flashed that no users were added. - Also, this commit adds a feedback when users were actually added to a project, in symmetry with how group members are handled. Closes #22967, #23270.
* Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master' Fatih Acet2016-10-221-1/+5
|\ | | | | | | | | | | | | Resolve "Cycle analytics date filter is not working" Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22892 See merge request !6906
| * Fix object data to be sent to fetch analytics dataAlfredo Sumaran2016-10-211-1/+5
| |
* | Fixed issue when images are loading it would push off the tabsfixed-mr-tabs-fixesPhil Hughes2016-10-201-2/+8
| |
* | Fixed issues with sticky mr tabs & sidebarPhil Hughes2016-10-201-10/+1
|/ | | | Closes #23504
* Create protected branches bundleAlfredo Sumaran2016-10-206-0/+1
|
* Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into ↵Fatih Acet2016-10-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix 'No label' and 'Any label' filters ## What does this MR do? Returns the `title`as the `id` for `No label`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Label filters not working as expected ## Screenshots (if relevant) ![2016-10-19_04.58.08](/uploads/3b079bf28299c1155e0243171ac008f6/2016-10-19_04.58.08.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 #23375 See merge request !6974
| * Return the title for id of 'No label'23375-filtering-on-any-label-or-no-label-does-not-workLuke Bennett2016-10-191-1/+1
| |
* | Add CRUD for Group LabelsDouglas Barbosa Alexandre2016-10-191-0/+2
| |
* | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-191-0/+11
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment #### Configuration In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669
| * Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-3/+35
| |\
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1813-433/+721
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-10-175-109/+172
| |\ \ \ | | | | | | | | | | | | | | | 22191-delete-dynamic-envs-mr
| * | | | Updates class name for consistencyFilipa Lacerda2016-10-171-2/+2
| | | | |
| * | | | Improve after code reviewKamil Trzcinski2016-10-171-1/+1
| | | | |
| * | | | Updates MR template to include stop linkFilipa Lacerda2016-10-171-0/+11
| | | | |
* | | | | Require missing Vue dependencyAlfredo Sumaran2016-10-181-0/+2
| |_|_|/ |/| | |
* | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-1813-433/+721
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1812-432/+720
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-108/+162
| | |\ \ \
| | * \ \ \ Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1715-84/+563
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | 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 textarea with Ace editorAlfredo Sumaran2016-10-131-7/+20
| | | | | |
| | * | | | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-133-54/+234
| | | | | |
| * | | | | Update endpoint to username validatorAlfredo Sumaran2016-10-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-3/+35
|/ / / /
* | | | 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
| | |_|/ | |/| |
* | | | Fixed find file keyboard navigationfind-file-enter-fixPhil Hughes2016-10-171-0/+9
|/ / / | | | | | | | | | Closes #23423
* | | 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
| |/ |/|
* | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-161-1/+12
| |
* | 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
| |
View Lorry Controller Status