summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 'fix_diff_parsing' into 'master'Sean McGivern2017-10-163-1/+25
|\ | | | | | | | | | | | | Fix diff parser so it tolerates to diff special markers in the content Closes #34431 See merge request gitlab-org/gitlab-ce!14848
| * add a changelog itemfix_diff_parsingValery Sizov2017-10-151-0/+5
| |
| * Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-152-1/+20
| |
* | Merge branch 'gitaly-call-kwargs' into 'master'Sean McGivern2017-10-161-4/+16
|\ \ | | | | | | | | | | | | Fix confusing double usage of 'metadata' See merge request gitlab-org/gitlab-ce!14871
| * | Fix confusing double usage of 'metadata'Jacob Vosmaer (GitLab)2017-10-161-4/+16
|/ /
* | Merge branch 'an/popen-deadline' into 'master'Sean McGivern2017-10-165-1/+208
|\ \ | | | | | | | | | | | | Popen with a timeout See merge request gitlab-org/gitlab-ce!14872
| * | Popen with a timeoutAndrew Newdigate2017-10-165-1/+208
|/ /
* | Merge branch 'implements-closing-docs' into 'master'Sean McGivern2017-10-161-1/+2
|\ \ | | | | | | | | | | | | Docs for Add "implements" to the default issue closing message regex See merge request gitlab-org/gitlab-ce!14880
| * | Update automatic_issue_closing.mdimplements-closing-docsVictor Wu2017-10-131-1/+2
| | |
* | | Merge branch 'backport-milestone-select-change' into 'master'Filipa Lacerda2017-10-161-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Backport a change in milestone_select from EE See merge request gitlab-org/gitlab-ce!14878
| * | | Backport a change in milestone_select from EEbackport-milestone-select-changePhil Hughes2017-10-131-0/+2
| |/ /
* | | Merge branch ↵Kamil Trzciński2017-10-164-0/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master' Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count` Closes #38960 See merge request gitlab-org/gitlab-ce!14807
| * | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, ↵fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-114-0/+31
| | | | | | | | | | | | | | | | instead of `Gcp::Cluster.count`
* | | | Merge branch '35853-pages-missing-dotfiles' into 'master'Kamil Trzciński2017-10-163-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Include a .hidden directory in pages artifact extraction tests See merge request gitlab-org/gitlab-ce!14852
| * | | | Include a .hidden directory in pages artifact extraction testsNick Thomas2017-10-123-0/+5
| | | | |
* | | | | Merge branch '27654-retry-button' into 'master'Phil Hughes2017-10-165-20/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move retry button to sidebar Closes #27654 See merge request gitlab-org/gitlab-ce!14873
| * | | | | Move retry button to sidebarFilipa Lacerda2017-10-165-20/+10
|/ / / / /
* | | | | Merge branch 'bvl-update-settings-api-docs' into 'master'Achilleas Pipinellis2017-10-141-32/+83
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update the settings api documentation See merge request gitlab-org/gitlab-ce!14877
| * | | | | Update the settings api documentationbvl-update-settings-api-docsBob Van Landuyt2017-10-131-32/+83
| | | | | |
* | | | | | Merge branch '39111-remove-n-shortcut' into 'master'Filipa Lacerda2017-10-131-4/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove global dropdown shortcut from help modal Closes #39111 See merge request gitlab-org/gitlab-ce!14876
| * | | | | Remove global dropdown shortcut from help modal39111-remove-n-shortcutAnnabel Dunstone Gray2017-10-131-4/+0
| | | | | |
* | | | | | Merge branch 'ph-shortcut-js-modules' into 'master'Filipa Lacerda2017-10-1312-322/+242
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Remove shortcut JS classes from global namespace See merge request gitlab-org/gitlab-ce!14783
| * | | | | spec fixesph-shortcut-js-modulesPhil Hughes2017-10-132-6/+4
| | | | | |
| * | | | | Remove shortcut JS classes from global namespacePhil Hughes2017-10-1312-317/+239
| | | | | |
* | | | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-1311-11/+227
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | added date parameter for time tracking See merge request gitlab-org/gitlab-ce!14866
| * | | | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-1311-11/+227
| |/ / / /
* | | | | Merge branch '39096-upgrade-vuex' into 'master'Phil Hughes2017-10-132-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Vuex version Closes #39096 See merge request gitlab-org/gitlab-ce!14868
| * | | | | Update Vuex version39096-upgrade-vuexFilipa Lacerda2017-10-132-4/+4
| | | | | |
* | | | | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master'Rémy Coutable2017-10-138-27/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory Closes #37571 See merge request gitlab-org/gitlab-ce!14850
| * | | | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factoryJacopo2017-10-138-27/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We replace the usage of WikiPage::CreateService with the wiki_page factory in the specs.
* | | | | | | Merge branch 'gitaly-merge' into 'master'Sean McGivern2017-10-139-17/+143
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Merge Requests via Gitaly Closes gitaly#654 See merge request gitlab-org/gitlab-ce!14791
| * | | | | | | Merge Merge Requests via GitalyJacob Vosmaer2017-10-139-17/+143
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'grpc-1.6.6' into 'master'Rémy Coutable2017-10-131-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use grpc 1.6.6 See merge request gitlab-org/gitlab-ce!14821
| * | | | | | | Use grpc 1.6.6Jacob Vosmaer2017-10-131-1/+4
| | | | | | | |
* | | | | | | | Merge branch 'server-flash-click-remove' into 'master'Filipa Lacerda2017-10-133-2/+34
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fixed server rendered flash not being removed on click See merge request gitlab-org/gitlab-ce!14864
| * | | | | | | Fixed server rendered flash not being removed on clickserver-flash-click-removePhil Hughes2017-10-133-2/+34
| | | | | | | |
* | | | | | | | Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-10-133-16/+34
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | backport for gitlab-ee!2869 See merge request gitlab-org/gitlab-ce!14505
| * | | | | | | backport for gitlab-ee!2869backport-ee-2869Simon Knox2017-10-133-16/+34
| | | | | | | |
* | | | | | | | Merge branch 'google-protobuf-3.4.1.1' into 'master'Rémy Coutable2017-10-131-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use google-protobuf 3.4.1.1 See merge request gitlab-org/gitlab-ce!14820
| * | | | | | | | Use google-protobuf 3.4.1.1google-protobuf-3.4.1.1Jacob Vosmaer2017-10-111-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-135-2/+46
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make "merge ongoing" check more consistent Closes #39032 See merge request gitlab-org/gitlab-ce!14825
View Lorry Controller Status