summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-237-5/+184
| | | | | | Encompasses designs from - https://gitlab.com/gitlab-org/gitlab-ce/issues/23206#note_43355199 - https://gitlab.com/gitlab-org/gitlab-ce/issues/29985#note_30417407
* Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1733-735/+522
|\ | | | | | | | | 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-dataPhil Hughes2017-10-171-2/+2
| |
| * Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-1713-35/+60
| | | | | | | | | | | | Adds a test for flattenedFiles Changes the data method to not be an arrow method Various other review fixes
| * fixed prev directory row not correctly having colspanPhil Hughes2017-10-163-9/+9
| |
| * fixed karma spec with prev directory buttonPhil Hughes2017-10-161-0/+1
| |
| * fixed karma build because of a removed methodPhil Hughes2017-10-161-1/+1
| |
| * made serializing genericPhil Hughes2017-10-164-26/+26
| | | | | | | | fixed previous directory showing when it shouldnt
| * fixed rendering bugsPhil Hughes2017-10-166-18/+7
| | | | | | | | fixed eslint
| * Spec updatesPhil Hughes2017-10-1614-221/+175
| | | | | | | | | | | | 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 structurePhil Hughes2017-10-1617-483/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'add-inline-edit-button' into 'master'Filipa Lacerda2017-10-176-17/+119
|\ \ | | | | | | | | | | | | Add inline edit button to issue_show app See merge request gitlab-org/gitlab-ce!14875
| * | Add inline edit button to issue_show appClement Ho2017-10-176-17/+119
|/ /
* | Merge branch 'winh-project-deletion-message' into 'master'Annabel Dunstone Gray2017-10-172-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Change project deletion message from alert to notice Closes #26956 See merge request gitlab-org/gitlab-ce!14756
| * | Change project deletion message from alert to noticeWinnie Hellmann2017-10-172-2/+2
|/ /
* | Merge branch ↵Rémy Coutable2017-10-171-3/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '20930-very-first-commit-to-default-branch-didn-t-close-referenced-issue' into 'master' Fix #20930: automatic closing is not triggered on very first push. Closes #20930 See merge request gitlab-org/gitlab-ce!11899
| * | Fix #20930: automatic closing is not triggered on very first push.Sébastien2017-10-171-3/+5
|/ /
* | Merge branch 'move-user-avatar-specs' into 'master'Phil Hughes2017-10-173-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-specsClement Ho2017-10-163-0/+0
| | |
* | | Merge branch 'improve-sprite-icon-spec' into 'master'Phil Hughes2017-10-171-10/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve sprite icon spec Closes #39199 See merge request gitlab-org/gitlab-ce!14914
| * | | Improve sprite icon specClement Ho2017-10-171-10/+18
|/ / /
* | | Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-176-36/+33
|\ \ \ | | | | | | | | | | | | | | | | Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889
| * | | Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-176-36/+33
| | | |
* | | | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-174-2/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors when deleting a forked project Closes #39196 See merge request gitlab-org/gitlab-ce!14916
| * | | | Fix errors when deleting a forked projectBob Van Landuyt2017-10-174-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem would occur when the `ForkedProjectLink` was deleted, but the `ForkNetworkMember` was not. The delete would be rolled back and retried. But the error would not be saved because `Project#forked?` would still be true, because the `ForkNetworkMember` exists. But the `Project#forked_project_link` would be `nil`. So the validation for the visibility level would fail.
* | | | | Merge branch '38156-breadcrumbs-margin' into 'master'Tim Zallmann2017-10-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use variable for mobile breadcrumbs padding Closes #38156 See merge request gitlab-org/gitlab-ce!14904
| * | | | | Use variable for mobile breadcrumbs padding38156-breadcrumbs-marginAnnabel Dunstone Gray2017-10-161-1/+1
| | | | | |
* | | | | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-173-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1 Closes #34728 See merge request gitlab-org/gitlab-ce!14718
| * | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-163-0/+17
| | | | | | |
* | | | | | | Merge branch ↵Rémy Coutable2017-10-172-2/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass' into 'master' Resolve "Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits::Error: #<NoMethodError: undefined method `map' for nil:NilClass" Closes #39181 See merge request gitlab-org/gitlab-ce!14907
| * | | | | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-172-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already handled for diffs, but not commits.
* | | | | | | | Merge branch 'fl-gke-collapsible-containers' into 'master'Phil Hughes2017-10-174-44/+67
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Adds collapsible sections in cluster page See merge request gitlab-org/gitlab-ce!14890
| * | | | | | | Adds collapsible sections in cluster pageFilipa Lacerda2017-10-174-44/+67
|/ / / / / / /
* | | | | | | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-172-14/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow testing on Gitaly call count See merge request gitlab-org/gitlab-ce!14837
| * | | | | | | Update gitaly.mdZeger-Jan van de Weg2017-10-171-2/+4
| | | | | | | |
| * | | | | | | Update documentationZeger-Jan van de Weg2017-10-171-15/+3
| | | | | | | |
| * | | | | | | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-162-14/+52
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Previous efforts were aimed at detecting N + 1 queries, general regressions are hard to find and mitigate.
* | | | | | | Merge branch 'fix/github-doc' into 'master'Rémy Coutable2017-10-171-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify how to resume GitHub import on docs See merge request gitlab-org/gitlab-ce!14905
| * | | | | | | clarify resuming importfix/github-docJames Lopez2017-10-171-0/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'bump-git-2-13-6' into 'master'Rémy Coutable2017-10-171-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Bump Git version to 2.13.6 See merge request gitlab-org/gitlab-ce!14906
| * | | | | | Bump Git version to 2.13.6bump-git-2-13-6Balasankar C2017-10-171-1/+1
| | | | | | |
* | | | | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-1721-127/+212
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * | | | | | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-178-25/+100
| | | | | | | |
| * | | | | | | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-1711-106/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of from the configuration file
| * | | | | | | Add existing circuitbreaker settings to the databaseBob Van Landuyt2017-10-173-1/+37
| | | | | | | |
* | | | | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1799-1183/+5069
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * | | | | | | | Preserve `archived` param only when sort order is changedbvl-group-treeskushalpandya2017-10-131-3/+3
| | | | | | | | |
| * | | | | | | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-133-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even when we pass an array of only a single object
| * | | | | | | | Remove unnecessary `Flash` importkushalpandya2017-10-131-1/+0
| | | | | | | | |
| * | | | | | | | Add `archived` related options in sort dropdownkushalpandya2017-10-133-14/+47
| | | | | | | | |
View Lorry Controller Status