summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Revert back FetchKubernetesTokenServiceKamil Trzcinski2017-11-016-38/+88
* Slim down Platforms::Kubernetes, and instead make it instrument KubernetesSer...Kamil Trzcinski2017-11-013-126/+41
* Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-012-6/+12
* Merge branch 'master' into refactor-clustersShinya Maeda2017-11-01177-2169/+3374
|\
| * Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-10-311-1/+4
| |\
| | * Normalize LDAP DN when looking up identityDouwe Maan2017-10-311-1/+4
| * | Merge branch 'multi-file-editor-vuex' into 'master'Filipa Lacerda2017-10-3142-1358/+1187
| |\ \
| | * | fixed up upload feature after master mergemulti-file-editor-vuexPhil Hughes2017-10-316-13/+28
| | * | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-318-8/+92
| | |\ \
| | * | | get branch name from the DOMPhil Hughes2017-10-312-2/+4
| | * | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3136-612/+393
| | |\ \ \
| | * | | | spec fixesPhil Hughes2017-10-311-0/+5
| | * | | | spec fixesPhil Hughes2017-10-305-11/+13
| | * | | | addressed feedback from reviewPhil Hughes2017-10-3014-57/+68
| | * | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3059-322/+651
| | |\ \ \ \
| | * | | | | updated karma specsPhil Hughes2017-10-278-22/+31
| | * | | | | reset hash when changing filesPhil Hughes2017-10-262-2/+3
| | * | | | | various different performance improvementsPhil Hughes2017-10-2610-37/+24
| | * | | | | fixed render_error not being hooked up correctlyPhil Hughes2017-10-265-34/+9
| | * | | | | fixed some state bugs with the tabsPhil Hughes2017-10-2610-38/+53
| | * | | | | correctly activate the next tab when closing a tabPhil Hughes2017-10-263-3/+28
| | * | | | | moved new file/directory into new storePhil Hughes2017-10-2619-692/+176
| | * | | | | [WIP] Move multi-file editor store to VuexPhil Hughes2017-10-2633-584/+910
| * | | | | | Load participants asyncEric Eastwood2017-10-3122-78/+400
| * | | | | | Merge branch '39509-fix-wiki-create-sidebar-overlap' into 'master'Annabel Dunstone Gray2017-10-311-5/+1
| |\ \ \ \ \ \
| | * | | | | | Fix overlap of right-sidebar and wiki create page form39509-fix-wiki-create-sidebar-overlapEric Eastwood2017-10-311-5/+1
| * | | | | | | Merge branch '31454-missing-project-id-pipeline-hook-data' into 'master'Rémy Coutable2017-10-311-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Adds project_id to pipeline hook dataJacopo2017-10-301-0/+1
| * | | | | | | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-314-5/+105
| * | | | | | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master'Sean McGivern2017-10-311-1/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-testAlejandro Rodríguez2017-10-301-1/+3
| * | | | | | | | | Merge branch '38869-issue' into 'master'Phil Hughes2017-10-316-52/+38
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable eslintFilipa Lacerda2017-10-311-14/+11
| | * | | | | | | | | Remove issue and issue status select from global namespaceFilipa Lacerda2017-10-306-51/+40
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '3674-hashed-storage-attachments' into 'master'Douwe Maan2017-10-313-14/+33
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make `#hashed_storage?` require feature argument3674-hashed-storage-attachmentsGabriel Mazetto2017-10-312-4/+7
| | * | | | | | | | | Code Style changes and `hashed_storage?` now receives optional featureGabriel Mazetto2017-10-313-24/+24
| | * | | | | | | | | Use the Hashed Storage compatible layer to store AttachmentsGabriel Mazetto2017-10-301-1/+1
| | * | | | | | | | | Moved renaming operations to storage layer abstractionGabriel Mazetto2017-10-273-9/+25
| * | | | | | | | | | Merge branch '39639-clusters-poll' into 'master'Phil Hughes2017-10-311-8/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adds callback function to inital cluster request39639-clusters-pollFilipa Lacerda2017-10-311-8/+14
| * | | | | | | | | | | Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-313-0/+67
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| | * | | | | | | | | | Add Packagist project serviceMatt Coleman2017-10-133-0/+67
| * | | | | | | | | | | Upload files through the multi-file editorPhil Hughes2017-10-318-10/+122
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Resolve "Convert autosize.js library to be a Yarn managed library"Tim Zallmann2017-10-313-7/+7
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-3016-174/+93
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-libraryAnnabel Dunstone Gray2017-10-303-20/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Enable NestingDepth (level 6) on scss-lintTakuya Noguchi2017-10-303-20/+5
| * | | | | | | | Refresh open Issue and Merge Request project counter caches when re-openingRob Ede2017-10-302-0/+2
| * | | | | | | | Merge branch 'sh-fix-broken-redirection-relative-url-root' into 'master'Rémy Coutable2017-10-301-1/+1
| |\ \ \ \ \ \ \ \
View Lorry Controller Status