summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into an/gita...an/gitaly-timeoutsAndrew Newdigate2017-11-01455-5794/+9195
|\
| * Merge branch '35914-merge-request-update-worker-is-slow' into 'master'Sean McGivern2017-11-014-20/+44
| |\
| | * rework the UpdateMergeRequestsWorker#metrics_tags35914-merge-request-update-worker-is-slowmicael.bergeron2017-11-011-4/+2
| | * reword `targets` to `metric tags`micael.bergeron2017-10-314-7/+13
| | * add metrics tagging to the sidekiq middlewaremicael.bergeron2017-10-313-20/+40
| * | Merge branch 'refactor/group_links_controller' into 'master'Douwe Maan2017-11-016-7/+76
| |\ \
| | * | Refactor/group links controllerFrancisco Javier López2017-11-016-7/+76
| |/ /
| * | Merge branch '38869-labels' into 'master'Phil Hughes2017-11-019-430/+422
| |\ \
| | * | Export logo and labels select as ES6 modulesFilipa Lacerda2017-11-019-430/+422
| |/ /
| * | Merge branch 'backport-workhorse-show-all-refs' into 'master'Douwe Maan2017-11-014-5/+25
| |\ \
| | * | Support show-all-refs for git over HTTPNick Thomas2017-10-304-5/+25
| * | | Merge branch '39628-bug-in-the-procedure-advised-from-ee_compat_check' into '...Sean McGivern2017-11-012-15/+16
| |\ \ \
| | * | | Ensure the ee-compat-check uses the correct patch URL for forks39628-bug-in-the-procedure-advised-from-ee_compat_checkRémy Coutable2017-10-312-15/+16
| * | | | Merge branch 'lazy-load-check-when-has-images' into 'master'Filipa Lacerda2017-11-011-8/+7
| |\ \ \ \
| | * | | | Increase lazy loader performancelazy-load-check-when-has-imagesPhil Hughes2017-10-311-8/+7
| * | | | | Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master'Sean McGivern2017-11-016-33/+157
| |\ \ \ \ \
| | * | | | | Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitalyAhmad Sherif2017-10-316-33/+157
| * | | | | | Merge branch 'rc-qa-mattermost-login' into 'master'Grzegorz Bizon2017-11-017-0/+107
| |\ \ \ \ \ \
| | * | | | | | Add tests for mattermost login via oauthRichard Clamp2017-10-306-0/+61
| | * | | | | | Add spec for QA::Scenario::EntrypointRichard Clamp2017-10-251-0/+46
| * | | | | | | Merge branch 'go-get-ssh' into 'master'Douwe Maan2017-11-013-55/+103
| |\ \ \ \ \ \ \
| | * | | | | | | Returns a ssh url for go-get=1Guilherme Vieira2017-10-313-55/+103
| * | | | | | | | Merge branch '39633-convert-fuzzaldrin-plus-js-library-to-be-a-yarn-managed-l...Phil Hughes2017-11-017-1164/+8
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"Tim Zallmann2017-11-017-1164/+8
| |/ / / / / / /
| * | | | | | | Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'Sean McGivern2017-10-314-25/+110
| |\ \ \ \ \ \ \
| | * | | | | | | Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitalyAhmad Sherif2017-10-314-25/+110
| * | | | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-10-319-12/+35
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Normalize LDAP DN when looking up identityDouwe Maan2017-10-319-12/+35
| * | | | | | | | | Merge branch '39580-bump-carrierwave-to-1-2-1' into 'master'Rémy Coutable2017-10-313-3/+8
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Bump carrierwave to 1.2.1Takuya Noguchi2017-10-303-3/+8
| * | | | | | | | | Merge branch 'multi-file-editor-vuex' into 'master'Filipa Lacerda2017-10-3163-2447/+1826
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fixed up upload feature after master mergemulti-file-editor-vuexPhil Hughes2017-10-317-46/+64
| | * | | | | | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3121-264/+283
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | get branch name from the DOMPhil Hughes2017-10-312-2/+4
| | * | | | | | | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3166-750/+695
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | spec fixesPhil Hughes2017-10-313-2/+7
| | * | | | | | | | | | | spec fixesPhil Hughes2017-10-307-13/+19
| | * | | | | | | | | | | addressed feedback from reviewPhil Hughes2017-10-3019-74/+93
| | * | | | | | | | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-30132-524/+2018
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | updated karma specsPhil Hughes2017-10-2727-1030/+612
| | * | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'zj/gitlab-ce-zj-ruby-2.3.5' into 'master'Sean McGivern2017-10-314-6/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Be able to bundle gems with newer rubieszj/gitlab-ce-zj-ruby-2.3.5Zeger-Jan van de Weg2017-10-311-1/+1
| | * | | | | | | | | | | | Upgrade Ruby to 2.3.5Zeger-Jan van de Weg2017-10-314-5/+10
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
View Lorry Controller Status