summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix failing testgo-go-gadget-webpackMike Greiling2017-02-031-1/+1
|
* fix Vue warnings for missing elementMike Greiling2017-02-031-2/+2
|
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03100-1992/+2066
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed eslint test failure Fixed redirection from http://someproject.git to http://someproject Add traits for the different Event types to the Event factory prevent nonewline type diff lines from containing unfolding link ensure linenumber data attribute is correct for the last line in a diff chunk ensure last line in diff block is contained within a table row element ensure click event is bound only once
| * Merge branch '26300-line-numbers-are-off-in-dynamically-loaded-diff-chunks' ↵Jacob Schatz2017-02-033-9/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Line numbers are off in dynamically loaded diff chunks" Closes #26300 See merge request !8428
| | * ensure linenumber data attribute is correct for the last line in a diff chunk26300-line-numbers-are-off-in-dynamically-loaded-diff-chunksMike Greiling2017-01-183-9/+7
| | |
| | * ensure last line in diff block is contained within a table row elementMike Greiling2017-01-182-2/+4
| | |
| * | Merge branch 'fix-scroll-test' into 'master' Alfredo Sumaran2017-02-032-1/+5
| |\ \ | | | | | | | | | | | | | | | | Change window size before visiting page, to get correct scroll position See merge request !8963
| | * | Change window size before visiting page, to get correct scroll positionfix-scroll-testFilipa Lacerda2017-02-032-1/+5
| | | |
| * | | Merge branch 'fix-slash-commands-spec-error' into 'master' Filipa Lacerda2017-02-031-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | Fix slash commands spec error See merge request !8968
| | * | Fix slash commands spec errorfix-slash-commands-spec-errorClement Ho2017-02-031-0/+2
| | | |
| * | | Merge branch 'git_to_html_redirection' into 'master' Sean McGivern2017-02-033-1/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect http://someproject.git to http://someproject Closes #26275 See merge request !8951
| | * | | Fixed redirection from http://someproject.git to http://someprojectblackst0ne2017-02-043-1/+16
| | | | |
| * | | | Merge branch 'docs/integrations' into 'master' Achilleas Pipinellis2017-02-0382-1938/+1971
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Refactor integrations page documentation See merge request !8966
| | * | | Move project services to new location under IntegrationsAchilleas Pipinellis2017-02-0375-907/+938
| | | | |
| | * | | Move webhooks to new a location under IntegrationsAchilleas Pipinellis2017-02-039-1032/+1034
| | | | |
| * | | | Merge branch 'eslint-fix' into 'master' Clement Ho2017-02-031-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed eslint test failure See merge request !8964
| | * | | | Fixed eslint test failureeslint-fixPhil Hughes2017-02-031-2/+2
| | | | | |
| * | | | | Merge branch ↵Jacob Schatz2017-02-031-4/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26825-diff-unfolding-within-merge-request-changes-tab-triggers-two-ajax-requests' into 'master' Resolve diff unfolding redundant ajax request Closes #26825 See merge request !8630
| | * | | | | ensure click event is bound only once26825-diff-unfolding-within-merge-request-changes-tab-triggers-two-ajax-requestsMike Greiling2017-01-181-4/+7
| | | | | | |
| * | | | | | Merge branch ↵Jacob Schatz2017-02-031-2/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '26829-diff-unfolding-links-erroneously-present-on-no-newline-lines' into 'master' Prevent "nonewline" type diff lines from showing a diff unfolding link Closes #26829 See merge request !8632
| | * | | | | | prevent nonewline type diff lines from containing unfolding link26829-diff-unfolding-links-erroneously-present-on-no-newline-linesMike Greiling2017-01-181-2/+10
| | | | | | | |
| * | | | | | | Merge branch 'rs-event-traits' into 'master' Rémy Coutable2017-02-037-35/+44
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add traits for the different Event types to the Event factory See merge request !8870
| | * | | | | | | Add traits for the different Event types to the Event factoryrs-event-traitsRobert Speicher2017-02-017-35/+44
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03287-2144/+3741
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (181 commits) Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href Disabled add issues button if no lists exist ...
| * | | | | | | | Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-0355-168/+88
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Turbolinks Closes #25624 See merge request !8570
| | * | | | | | | | Find .merge-request instead of sleep in MR search spec.25624-anticipate-obstacles-to-removing-turbolinksBryce Johnson2017-02-021-1/+3
| | | | | | | | | |
| | * | | | | | | | Rename scripts_body_top to project_javascripts.Bryce Johnson2017-02-022-2/+2
| | | | | | | | | |
| | * | | | | | | | Remove turbolinks from filtered search after rebase.Bryce Johnson2017-02-021-6/+4
| | | | | | | | | |
| | * | | | | | | | Remove turbolinks.Bryce Johnson2017-02-0253-161/+81
| | | | | | | | | |
| * | | | | | | | | Merge branch 'add-issues-to-boards' into 'master' Fatih Acet2017-02-0363-426/+1917
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issues to boards list Closes #26205 See merge request !8737
| | * | | | | | | | Fixed adding to list bugPhil Hughes2017-02-031-2/+5
| | | | | | | | | |
| | * | | | | | | | Fixed modal lists dropdown not updating when list is deletedadd-issues-to-boardsPhil Hughes2017-02-034-6/+26
| | | | | | | | | |
| | * | | | | | | | Fixed remove btn error after creating new issue in listPhil Hughes2017-02-031-0/+1
| | | | | | | | | |
| | * | | | | | | | Removed duplicated testPhil Hughes2017-02-031-1/+1
| | | | | | | | | |
| | * | | | | | | | Removed Masonry, instead uses groups of dataPhil Hughes2017-02-0316-2551/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some error handling which reverts the frontend data changes & notifies the user
| | * | | | | | | | Uses mixins for repeated functionsPhil Hughes2017-02-036-10/+26
| | | | | | | | | |
| | * | | | | | | | Fixed up specsPhil Hughes2017-02-033-21/+3
| | | | | | | | | |
| | * | | | | | | | Props use objects with required & type valuesPhil Hughes2017-02-037-23/+73
| | | | | | | | | |
| | * | | | | | | | Removes labels instead of closing issue when clicking remove buttonPhil Hughes2017-02-039-18/+38
| | | | | | | | | |
| | * | | | | | | | Fixed JS lint errorsPhil Hughes2017-02-031-3/+2
| | | | | | | | | |
| | * | | | | | | | Fixed issue card specPhil Hughes2017-02-031-2/+4
| | | | | | | | | |
| | * | | | | | | | Added webkit CSS propertiesPhil Hughes2017-02-031-0/+9
| | | | | | | | | |
| | * | | | | | | | Fixed bug with empty state showing after searchPhil Hughes2017-02-0321-30/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed users href path being incorrect
| | * | | | | | | | Fixed bug where 2 un-selected issues would stay on selected tabPhil Hughes2017-02-031-2/+3
| | | | | | | | | |
| | * | | | | | | | Fixed DB schemaPhil Hughes2017-02-035-33/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed how components are added in objects
| | * | | | | | | | Added remove buttonPhil Hughes2017-02-035-2/+77
| | | | | | | | | |
| | * | | | | | | | Add optional id property to the issue schemaDouglas Barbosa Alexandre2017-02-031-0/+1
| | | | | | | | | |
| | * | | | | | | | Fixed issue link hrefPhil Hughes2017-02-033-6/+16
| | | | | | | | | |
| | * | | | | | | | Disabled add issues button if no lists existPhil Hughes2017-02-033-11/+23
| | | | | | | | | |
| | * | | | | | | | Remove unnecessary include from RemoveBacklogListsFromBoards migrationDouglas Barbosa Alexandre2017-02-031-2/+0
| | | | | | | | | |