summaryrefslogtreecommitdiff
Commit message (Expand)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
* 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 rendering bugsPhil Hughes2017-10-166-18/+7
* Spec updatesPhil Hughes2017-10-1614-221/+175
* Refactored multi-file data structurePhil Hughes2017-10-1617-483/+301
* Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-163-1/+25
|\
| * 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'Jacob Vosmaer (GitLab)2017-10-161-4/+16
|/ /
* | Merge branch 'an/popen-deadline' into 'master'Sean McGivern2017-10-165-1/+208
|\ \
| * | Popen with a timeoutAndrew Newdigate2017-10-165-1/+208
|/ /
* | Merge branch 'implements-closing-docs' into 'master'Sean McGivern2017-10-161-1/+2
|\ \
| * | 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 EEbackport-milestone-select-changePhil Hughes2017-10-131-0/+2
| |/ /
* | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-164-0/+31
|\ \ \
| * | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, inste...fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-114-0/+31
* | | | Merge branch '35853-pages-missing-dotfiles' into 'master'Kamil Trzciński2017-10-163-0/+5
|\ \ \ \
| * | | | 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 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 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 modal39111-remove-n-shortcutAnnabel Dunstone Gray2017-10-131-4/+0
* | | | | | Merge branch 'ph-shortcut-js-modules' into 'master'Filipa Lacerda2017-10-1312-322/+242
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 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 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' factoryJacopo2017-10-138-27/+12
* | | | | | | Merge branch 'gitaly-merge' into 'master'Sean McGivern2017-10-139-17/+143
|\ \ \ \ \ \ \
| * | | | | | | 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.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 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!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.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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
View Lorry Controller Status