| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove dropzoneInput from global namespace | Filipa Lacerda | 2017-10-19 | 2 | -3/+1 |
| | | |||||
| * | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master' | Tim Zallmann | 2017-10-18 | 1 | -20/+50 |
| |\ | | | | | | | | | Add lazy option to UserAvatarImage See merge request gitlab-org/gitlab-ce!14895 | ||||
| | * | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-component | Eric Eastwood | 2017-10-17 | 1 | -20/+50 |
| | | | |||||
| * | | Fix Pikaday | Filipa Lacerda | 2017-10-18 | 1 | -0/+29 |
| | | | |||||
| * | | Merge branch 'sh-security-fix-backports-master' into 'master' | Robert Speicher | 2017-10-18 | 1 | -0/+23 |
| |\ \ | | | | | | | | | | | | | Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922 | ||||
| | * \ | Merge branch 'master' into sh-security-fix-backports-master | Stan Hu | 2017-10-17 | 31 | -540/+1869 |
| | |\ \ | | |/ | |||||
| | * | | Merge branch 'security-10-1' into '10-1-stable' | Jen-Shin Lin | 2017-10-17 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209 | ||||
| * | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master' | Grzegorz Bizon | 2017-10-18 | 1 | -4/+4 |
| |\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917 | ||||
| | * | | Fix broken testkt/bug/fix-revision-and-size-for-container-registry | Filipa Lacerda | 2017-10-17 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add short_revision and use total_size | Kamil Trzcinski | 2017-10-17 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master' | Filipa Lacerda | 2017-10-17 | 12 | -227/+164 |
| |\ \ \ | | | | | | | | | | | | | | | | | Refactored multi-file data structure See merge request gitlab-org/gitlab-ce!14862 | ||||
| | * | | | fixed Karam test because of event name changeph-multi-file-editor-restructure-data | Phil Hughes | 2017-10-17 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fixed bug when clicking file link causing user to navigate away | Phil Hughes | 2017-10-17 | 2 | -2/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Adds a test for flattenedFiles Changes the data method to not be an arrow method Various other review fixes | ||||
| | * | | | fixed karma spec with prev directory button | Phil Hughes | 2017-10-16 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | fixed karma build because of a removed method | Phil Hughes | 2017-10-16 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fixed rendering bugs | Phil Hughes | 2017-10-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | fixed eslint | ||||
| | * | | | Spec updates | Phil Hughes | 2017-10-16 | 11 | -195/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Updated as best as possible, a lot of tests still change the store and never reset the state back which can cause some issues with other tests. | ||||
| | * | | | Refactored multi-file data structure | Phil Hughes | 2017-10-16 | 1 | -33/+0 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves away from storing in a single array just to render the table. It now stores in a multi-dimensional array/object type where each entry in the array can have its own tree. This makes storing the data for future feature a little easier as there is only one way to store the data. Previously to insert a directory the code had to insert the directory & then the file at the right point in the array. Now the directory can be inserted anywhere & then a file can be quickly added into this directory. The rendering is still done with a single array, but this is handled through underscore. Underscore takes the array & then goes through each item to flatten it into one. It is done this way to save changing the markup away from table, keeping it as a table keeps it semantically correct. | ||||
| * | | | Add inline edit button to issue_show app | Clement Ho | 2017-10-17 | 2 | -3/+47 |
| | | | | |||||
| * | | | Merge branch 'move-user-avatar-specs' into 'master' | Phil Hughes | 2017-10-17 | 3 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move user avatar specs to folder to mimic javascript directory Closes #39169 See merge request gitlab-org/gitlab-ce!14901 | ||||
| | * | | | Move user avatar specs to folder to mimic javascript directorymove-user-avatar-specs | Clement Ho | 2017-10-16 | 3 | -0/+0 |
| | | | | | |||||
| * | | | | Improve sprite icon spec | Clement Ho | 2017-10-17 | 1 | -10/+18 |
| | | | | | |||||
| * | | | | Merge branch 'bvl-group-trees' into 'master' | Douwe Maan | 2017-10-17 | 13 | -303/+1639 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055 | ||||
| | * | | | | Add support for `archived` param | kushalpandya | 2017-10-13 | 3 | -5/+9 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 42 | -438/+2783 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | Groups tree enhancements for Groups Dashboard and Group Homepage | Kushal Pandya | 2017-10-04 | 13 | -303/+1635 |
| | | | | | | |||||
| * | | | | | Merge branch 'sprite-icon-class' into 'master'convert-js-modules | Phil Hughes | 2017-10-17 | 1 | -1/+5 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Add ability to pass class name to spriteIcon helper Closes #39079 See merge request gitlab-org/gitlab-ce!14855 | ||||
| | * | | | | Add ability to pass class name to spriteIcon helpersprite-icon-class | Clement Ho | 2017-10-12 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | Move retry button to sidebar | Filipa Lacerda | 2017-10-16 | 1 | -7/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'ph-shortcut-js-modules' into 'master' | Filipa Lacerda | 2017-10-13 | 2 | -9/+6 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Remove shortcut JS classes from global namespace See merge request gitlab-org/gitlab-ce!14783 | ||||
| | * | | | | spec fixesph-shortcut-js-modules | Phil Hughes | 2017-10-13 | 1 | -5/+3 |
| | | | | | | |||||
| | * | | | | Remove shortcut JS classes from global namespace | Phil Hughes | 2017-10-13 | 2 | -4/+3 |
| | | | | | | |||||
| * | | | | | Fixed server rendered flash not being removed on clickserver-flash-click-remove | Phil Hughes | 2017-10-13 | 1 | -0/+21 |
| |/ / / / | |||||
| * | | | | Add create merge checkbox. | Jacob Schatz | 2017-10-12 | 2 | -57/+117 |
| |/ / / | |||||
| * | | | Resolve "Prometheus service page shows error" | Jose Ivan Vargas Lopez | 2017-10-12 | 1 | -4/+8 |
| | | | | |||||
| * | | | Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master' | Clement Ho | 2017-10-11 | 6 | -16/+50 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup data-page attribute after each Karma test Closes #38871 See merge request gitlab-org/gitlab-ce!14742 | ||||
| | * | | | Cleanup data-page attribute after each Karma test38871-cleanup-data-page-attribute-after-karma-test | Eric Eastwood | 2017-10-11 | 6 | -16/+50 |
| | | |/ | |/| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871 | ||||
| * | | | spec fixesph-gl-form-js-modules | Phil Hughes | 2017-10-11 | 2 | -19/+10 |
| | | | | |||||
| * | | | Moves form related JS modules out of global | Phil Hughes | 2017-10-11 | 1 | -91/+89 |
| |/ / | |||||
| * | | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-label | Phil Hughes | 2017-10-10 | 3 | -151/+131 |
| |\ \ | | | | | | | | | | | | | Remove u2f from global namespace See merge request gitlab-org/gitlab-ce!14776 | ||||
| | * | | Remove u2f from globalnamespace38869-u2f | Filipa Lacerda | 2017-10-09 | 3 | -151/+131 |
| | | | | |||||
| * | | | Merge branch 'flash-es6-module' into 'master' | Filipa Lacerda | 2017-10-10 | 3 | -6/+275 |
| |\ \ \ | | | | | | | | | | | | | | | | | Flash is now a ES6 module See merge request gitlab-org/gitlab-ce!14626 | ||||
| | * | | | fixed notes specs | Phil Hughes | 2017-10-10 | 1 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | changed how the container class is added onto the text element more specs | ||||
| | * | | | karma spec fixes | Phil Hughes | 2017-10-10 | 2 | -5/+5 |
| | | | | | |||||
| | * | | | fixed eslint | Phil Hughes | 2017-10-10 | 1 | -3/+2 |
| | | | | | |||||
| | * | | | flash tests | Phil Hughes | 2017-10-10 | 1 | -0/+248 |
| | | | | | | | | | | | | | | | | | added back in documentation comment to flash file | ||||
| | * | | | spec fixes | Phil Hughes | 2017-10-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove Build code from global namespace | Filipa Lacerda | 2017-10-10 | 1 | -22/+21 |
| |/ / / | |||||
| * | | | Fix bad type checking to prevent 0 count badge to be shown | Filipa Lacerda | 2017-10-10 | 2 | -44/+39 |
| |/ / | |||||
| * | | Removes CommitsList from global namespace | Filipa Lacerda | 2017-10-09 | 1 | -56/+52 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |