summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | Fixed new line being included in bold/italic in GFM formPhil Hughes2016-12-211-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #25456
| * | | | | | | | | | | | | | | | | Merge branch ↵Fatih Acet2017-01-057-57/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26155-merge-request-tabs-don-t-render-when-no-commits-available' into 'master' Resolve "Merge request tabs don't render when no commits available" Closes #26155 and #24556 See merge request !8347
| | * | | | | | | | | | | | | | | | | include all expected instance vars for _show.html.haml template within tests26155-merge-request-tabs-don-t-render-when-no-commits-availableMike Greiling2017-01-032-2/+7
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | fix failing testsMike Greiling2017-01-031-5/+14
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | prevent 500 error when selecting changes tab for non-existent branchMike Greiling2017-01-031-1/+1
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | add CHANGELOG.md entry for !8347Mike Greiling2017-01-031-0/+4
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | show empty state for commits tab when no commits presentMike Greiling2017-01-031-2/+8
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | render merge request tabs regardless of commit historyMike Greiling2017-01-031-47/+46
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch '26346-cannot-reset-or-remove-mr-issues-description-templates' ↵Fatih Acet2017-01-052-13/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Cannot reset or remove MR/Issues description templates" Closes #26346 See merge request !8446
| | * | | | | | | | | | | | | | | | | Fix remove template26346-cannot-reset-or-remove-mr-issues-description-templatesLuke "Jared" Bennett2017-01-042-13/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | move param helper to common utilsRegis2017-01-094-23/+16
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | use Turbolinks instead of window.pushState for paginationRegis2017-01-092-10/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | namespace getParametersByName to gl.utils instead of just glRegis2017-01-094-10/+13
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | use Object.assign instead of Vue.set - change duration to computed propRegis2017-01-072-7/+7
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | remove bitwise disable on pipelines.js.es6Regis2017-01-061-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | remove disabled rules - not needed anymoreRegis2017-01-061-1/+0
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | remove parenthesis around returned objects in pipelines.js.es6Regis2017-01-061-3/+3
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | change 'pipelines.length' logic for spinnerRegis2017-01-061-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | fix flash and request logic in stageRegis2017-01-061-3/+5
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | fix cssClasses in status componentRegis2017-01-061-2/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | add param_helper to utils - fix switch statement in paginationRegis2017-01-062-9/+11
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | remove white spaceRegis2017-01-061-3/+0
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | remove pipeline head component and use staic HTML insteadRegis2017-01-063-21/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | use switch for paginationRegis2017-01-061-12/+18
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | no space for requires - all consistent syntax = change if logic for index.js.es6Regis2017-01-063-38/+31
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Remove invalid pipeline status icon nameGrzegorz Bizon2017-01-051-2/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix pipeline stage graph test example false positiveGrzegorz Bizon2017-01-051-6/+7
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix pipelines feature specs after invalid mergeGrzegorz Bizon2017-01-051-15/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Simplifies the HTML strucutre in the mini pipeline graph to make it as ↵Filipa Lacerda2017-01-053-31/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | similar as the one in haml as possible
* | | | | | | | | | | | | | | | | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-05142-747/+10874
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
| * | | | | | | | | | | | | | | | | | Merge branch 'pipelines-graph-html-css' into 'master' Annabel Dunstone Gray2017-01-0510-276/+283
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines graph HTML and CSS improvements and bug fixing Closes #26257 See merge request !8443
| | * | | | | | | | | | | | | | | | | | Adds back removed class in merge request pipelines tableFilipa Lacerda2017-01-051-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix dropdown icon alignmentAnnabel Dunstone Gray2017-01-051-12/+18
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Simplify HTML of mini pipeline graph and dropdownFilipa Lacerda2017-01-059-268/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups
| * | | | | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-01-054-5/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '19966-api-call-to-move-project-to-different-group-fails-when-using-group-and-project-names-instead-of-id' into 'master' Fix groups API to accept path when transferring a project Closes #19966 See merge request !8408
| | * | | | | | | | | | | | | | | | | | | Fix groups API to accept path when transferring a projectMark Fletcher2017-01-034-5/+74
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use standard helpers for finding group and project
| * | | | | | | | | | | | | | | | | | | Merge branch 'move-admin-deploy-keys-spinach-to-rspec' into 'master' Rémy Coutable2017-01-053-90/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin deploy keys spinach to rspec See merge request !8405
| | * | | | | | | | | | | | | | | | | | | Move admin deploy keys spinach to rspecSemyon Pupkov2017-01-033-90/+29
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-01-053-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26261-post-api-v3-projects-idorproject-commits-commits-does-not-work-with-project-path' into 'master' Fix Commits API to accept a Project path upon POST Closes #26261 See merge request !8406
| | * | | | | | | | | | | | | | | | | | | | Fix Commits API to accept a Project path upon POSTMark Fletcher2017-01-033-1/+14
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'single-edit-comment-widget-2' into 'master' Alfredo Sumaran2017-01-0512-76/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor discussion edit widget to have only one at a time. Closes #23227 See merge request !8356
| | * | | | | | | | | | | | | | | | | | | | | Fix review comments.single-edit-comment-widget-2Fatih Acet2017-01-054-5/+6
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Add spec for note edit and fix one commented spec.Fatih Acet2017-01-042-9/+29
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Review fixes.Fatih Acet2017-01-044-11/+10
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Use gl.utils.isInViewport and improve gl.utils.animateToElement.Fatih Acet2017-01-044-22/+33
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Make sure elements share the same scopeAlfredo Sumaran2017-01-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there are multiple instances of text editors on the current fixture file we will use the one that creates a comment.
| | * | | | | | | | | | | | | | | | | | | | | Hide edit warning element when form reverted.Fatih Acet2017-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Remove unnecessary styling came from merge conflicts.Fatih Acet2017-01-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Fix single note edit form specs.Fatih Acet2017-01-043-4/+6
| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Separate edit form in Changes and Discussions tab.Fatih Acet2017-01-042-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if we are in the Merge Requests page, this change will clone existing note-edit-form and add a mr-discussion-edit-form class to cloned element so we will have two note-edit-form in place. One for Discussions tab one for Changes tab. For MR page, we basically need two note-edit-form because you may want to edit your comment in both tabs at the same time and we shouldn't remove or discard note-edit-form in other tab.