summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed edit form authenticity_token call failing the testsfixed-edit-form-failing-testPhil Hughes2017-01-062-3/+4
|
* Merge branch 'fix-timezone-due-date-picker' into 'master' Alfredo Sumaran2017-01-064-5/+18
|\ | | | | | | | | | | | | Fix timezone due date picker Closes #24253 See merge request !8081
| * Wait for ajax after clicking on a dateAlfredo Sumaran2017-01-051-0/+4
| |
| * add comment to explain why we are avoiding the dateString constructor option ↵fix-timezone-due-date-pickerMike Greiling2017-01-021-0/+1
| | | | | | | | for our Date object
| * make expected due_date value format explicitMike Greiling2017-01-021-1/+1
| |
| * remove unnecessary utility functionMike Greiling2017-01-022-17/+3
| |
| * remove unnecessary fixtures and testsMike Greiling2017-01-024-90/+2
| |
| * add rspec feature testMike Greiling2017-01-021-2/+4
| |
| * fix eslint complaintsMike Greiling2017-01-021-3/+3
| |
| * use single sprockets require comment style and remove eslint-disableMike Greiling2017-01-021-4/+4
| |
| * fix eslint violationsMike Greiling2017-01-021-3/+3
| |
| * add MR number to changelog entryMike Greiling2017-01-021-1/+1
| |
| * Pass date as integer params on instantiate new Date in order to avoid time ↵giulianovarriale2017-01-026-3/+111
| | | | | | | | zone inconsistency
* | Merge branch 'fix-u2f-fixtures' into 'master' Alfredo Sumaran2017-01-056-6/+51
|\ \ | | | | | | | | | | | | Replace static JavaScript fixtures for u2f See merge request !8426
| * | generate u2f frontend fixtures dynamicallyMike Greiling2017-01-055-5/+49
| | |
| * | force utf-8 encoding for prior to fixture parsing to prevent nokogiri issuesMike Greiling2017-01-051-0/+1
| | |
| * | exclude script type=text/template from dom scrubbingMike Greiling2017-01-051-1/+1
| |/
* | Merge branch '26352-user-dropdown-settings' into 'master' Annabel Dunstone Gray2017-01-054-4/+8
|\ \ | | | | | | | | | | | | | | | | | | 26352 Change Profile settings to User / Settings Closes #26352 See merge request !8453
| * | 26352 Change Profile settings to User / Settings26352-user-dropdown-settingstauriedavis2017-01-044-4/+8
| | |
* | | Merge branch 'markdown-button-newline-bug-fix' into 'master' Fatih Acet2017-01-052-3/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed new line being included in bold/italic in GFM form Closes #25456 See merge request !8086
| * | | Fixed first newline not workingmarkdown-button-newline-bug-fixPhil Hughes2016-12-212-1/+49
| | | |
| * | | 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
| | | | | |
* | | | | | 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
| | | | | | | | | | |