summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ph-multi-file-editor-new-file-folder-dropdownph-multi-file-editor-new-file-folder-dropdownPhil Hughes2017-10-2317-12/+520
|\
| * Merge branch 'fix-escaped-text-replacement' into 'master'Filipa Lacerda2017-10-232-3/+15
| |\
| | * notes.js: use the original content when resetting the formBen Boeckel2017-10-192-2/+12
| | * notes.js: also return the original content when getting form dataBen Boeckel2017-10-191-1/+3
| * | Merge branch 'create-new-branch-repo-editor' into 'master'Filipa Lacerda2017-10-2310-9/+449
| |\ \
| | * | Create new branch from dropdown.Jacob Schatz2017-10-2310-9/+449
| |/ /
| * | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-235-0/+56
| |\ \
| | * | Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-235-0/+56
* | | | spec fixesPhil Hughes2017-10-234-139/+146
* | | | moved to eventHub to manage creating new filesPhil Hughes2017-10-237-50/+71
* | | | fixed eslint :see_no_evil:Phil Hughes2017-10-231-3/+1
* | | | added feature specPhil Hughes2017-10-235-4/+107
* | | | fixed failing title testPhil Hughes2017-10-232-0/+2
* | | | fixed bug with tabs not switching correctlyPhil Hughes2017-10-237-13/+54
* | | | failing spec fixesPhil Hughes2017-10-236-47/+42
* | | | correctly creates file in currently viewed directoryPhil Hughes2017-10-237-4/+250
* | | | changed adding temp files/directories code to match new structurePhil Hughes2017-10-232-20/+37
* | | | fixed new file/directory modal using methods that no longer existPhil Hughes2017-10-233-46/+47
* | | | Add new files & directories in the multi-file editorPhil Hughes2017-10-2312-32/+257
|/ / /
* | | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-237-5/+184
|\ \ \
| * | | Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-237-5/+184
* | | | Merge branch 'patch-8' into 'master'Achilleas Pipinellis2017-10-231-4/+0
|\ \ \ \
| * | | | Update using_docker_images.mdPaul2017-10-231-4/+0
* | | | | Merge branch '38869-diff' into 'master'Phil Hughes2017-10-236-26/+18
|\ \ \ \ \
| * | | | | Remove Diff class from globalnamespaceFilipa Lacerda2017-10-196-26/+18
* | | | | | Merge branch '39308-fix-broken-master' into 'master'Sean McGivern2017-10-231-1/+2
|\ \ \ \ \ \
| * | | | | | Fix the broken .tests-metadata-state definitionRémy Coutable2017-10-201-1/+2
* | | | | | | Merge branch 'sh-fix-container-registry-destroy' into 'master'Filipa Lacerda2017-10-232-4/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix deletion of container registry or images returning an errorStan Hu2017-10-232-4/+7
* | | | | | | | Merge branch 'fix-fog-aliyun-39126' into 'master'Stan Hu2017-10-232-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This...Paul B2017-10-232-3/+3
|/ / / / / / /
* | | | | | | Merge branch '28202_decrease_abc_threshold_step5' into 'master'Robert Speicher2017-10-223-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Decrease ABC threshold to 54.28Maxim Rydkin2017-10-223-5/+12
|/ / / / / / /
* | | | | | | Merge branch 'bvl-fix-group-atom-feed' into 'master'Douwe Maan2017-10-223-0/+41
|\ \ \ \ \ \ \
| * | | | | | | Make sure we render events for projects within a groupBob Van Landuyt2017-10-203-0/+41
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update VERSION to 10.2.0-prev10.2.0.preStan Hu2017-10-211-1/+1
* | | | | | | Update CHANGELOG.md for 10.1.0Stan Hu2017-10-21187-932/+192
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2017-10-210-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`Alessio Caiazza2017-10-211-0/+2
| * | | | | | | Fix the external URLs generated for online view of HTML artifactsNick Thomas2017-10-213-10/+19
| * | | | | | | Use title as placeholder instead of issue title for reusabilityClement Ho2017-10-214-7/+12
| * | | | | | | Fix failure in current_settings_spec.rbWinnie Hellmann2017-10-211-1/+1
| * | | | | | | Clarify the difference between project_update and project_renameJoe Marty2017-10-212-0/+7
| * | | | | | | URI decode Page-Title header to preserve UTF-8 charactersToon Claes2017-10-213-2/+16
| * | | | | | | Update Gitaly version to v0.49.0Andrew Newdigate2017-10-211-1/+1
| * | | | | | | Decrease Perceived Complexity threshold to 14Maxim Rydkin2017-10-213-9/+27
| * | | | | | | Resolve "Remove help text regarding group issues on group issues page (and gr...Victor Wu2017-10-213-14/+5
| * | | | | | | Force non diff resolved discussion to display when collapse toggledClement Ho2017-10-213-7/+29
| * | | | | | | Added submodule support in multi-file editorPhil Hughes2017-10-218-5/+75
| * | | | | | | add note about after_script being run separatelyMartin Nowak2017-10-211-0/+6