summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clus...Kamil Trzcinski2017-12-05164-996/+4315
|\
| * Merge remote-tracking branch 'origin/master' into 35616-move-k8-to-cluster-pageKamil Trzcinski2017-12-0529-164/+486
| |\
| | * Merge branch 'gitaly-conflict-file' into 'master'Sean McGivern2017-12-052-2/+2
| | |\
| | | * Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-fileAlejandro Rodríguez2017-12-041-1/+1
| | | * Add missing attr_accessor to Gitlab::Git::Conflict::FileAlejandro Rodríguez2017-12-041-1/+1
| | * | Merge branch '35616-move-k8-to-cluster-page' into 'master'Grzegorz Bizon2017-12-0538-632/+1160
| | |\ \
| | | * | Second iteration of Move Kubernetes from service to Cluster pageFilipa Lacerda2017-12-0538-632/+1160
| | |/ /
| | * | Merge branch 'bvl-limit-fork-queries-on-project-show' into 'master'Sean McGivern2017-12-055-7/+60
| | |\ \
| | | * | Count occurrences of a specific query in the query recorder.bvl-limit-fork-queries-on-project-showBob Van Landuyt2017-12-042-11/+18
| | | * | Cache the forks in a namespace in the RequestStoreBob Van Landuyt2017-12-044-2/+48
| | * | | Merge branch 'backport-epic-nav' into 'master'Sean McGivern2017-12-052-4/+7
| | |\ \ \
| | | * | | Backport Extract epic nav into separate partial for easier CE => EEClement Ho2017-12-052-4/+7
| | |/ / /
| | * | | Merge branch 'ce-gitaly-worktree-refactor' into 'master'Sean McGivern2017-12-051-8/+140
| | |\ \ \
| | | * | | Backport Squash/Rebase refactor from EEce-gitaly-worktree-refactorAlejandro Rodríguez2017-12-041-8/+140
| | | | |/ | | | |/|
| | * | | Merge branch 'docs/clarify-review-docs-process' into 'master'Rémy Coutable2017-12-051-1/+12
| | |\ \ \
| | | * | | Clarify the docs review process and mention the supported reposdocs/clarify-review-docs-processAchilleas Pipinellis2017-11-231-1/+12
| | * | | | Merge branch 'ce-1379-update-sidebar-weight-to-vue-and-add-to-boards' into 'm...Phil Hughes2017-12-0511-131/+249
| | |\ \ \ \
| | | * | | | Backport changes from refactor sidebar weight block Vue and move to Issue Boardsce-1379-update-sidebar-weight-to-vue-and-add-to-boardsEric Eastwood2017-12-0411-131/+249
| | * | | | | Merge branch '39367-fix-new-email-session-path' into 'master'Douwe Maan2017-12-057-11/+16
| | |\ \ \ \ \
| | | * | | | | remove ambiguity about which resource type to be using for new sessionsBrett Walker2017-12-057-11/+16
| | |/ / / / /
| * | | | | | Clean up clusters_controller_spec.rbShinya Maeda2017-12-051-27/+13
| * | | | | | Add merge_request number in changelogShinya Maeda2017-12-051-1/+1
| * | | | | | Fix typo secret-keyShinya Maeda2017-12-051-1/+1
| * | | | | | Use find instead of find_by!Shinya Maeda2017-12-051-1/+1
| * | | | | | Merge branch 'master' into 35616-move-k8-to-cluster-pageShinya Maeda2017-12-0516-114/+257
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '40739-access-404' into 'master'Grzegorz Bizon2017-12-053-38/+66
| | |\ \ \ \ \
| | | * | | | | Prevent job link form rendering when user does not have permissions40739-access-404Filipa Lacerda2017-12-043-38/+66
| | * | | | | | Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher2017-12-047-63/+144
| | |\ \ \ \ \ \
| | | * | | | | | Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif2017-12-047-63/+144
| | * | | | | | | Merge branch 'user-agent-gke-api' into 'master'Kamil Trzciński2017-12-043-6/+35
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add CHANGELOG entryuser-agent-gke-apiMatija Čupić2017-12-041-0/+5
| | | * | | | | | | Refactor GCP Client#user_agent_header to use #tapMatija Čupić2017-12-041-3/+3
| | | * | | | | | | Test usage of custom user agent in GCP ClientMatija Čupić2017-12-042-6/+10
| | | * | | | | | | Use RequestOptions in GCP Client user_agent_headerMatija Čupić2017-12-042-3/+10
| | | * | | | | | | Generate user agent header for GCP ClientMatija Čupić2017-12-042-0/+13
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'backstage/gb/improve-pipeline-chain-reduce-side-effects' into '...40818-last-push-widget-does-not-appear-after-pushing-new-commit-to-a-branch-that-was-previously-merged-to-masterKamil Trzciński2017-12-041-7/+6
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Reduce pipeline chain life span to minimize side effectsbackstage/gb/improve-pipeline-chain-reduce-side-effectsGrzegorz Bizon2017-12-041-7/+6
| | * | | | | | | Merge branch '39727-add-axios-to-common' into 'master'Phil Hughes2017-12-042-0/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Import axios utils in commons39727-add-axios-to-commonFilipa Lacerda2017-12-042-0/+6
| | | |/ / / / / /
| * | | | | | | | Merge branch 'master' into 35616-move-k8-to-cluster-pageShinya Maeda2017-12-05109-676/+3525
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch '39869_show_closed_status_of_links_to_issues_on_wiki_pages' into...Robert Speicher2017-12-043-2/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | show status of issue links in wiki pagehaseeb2017-12-043-2/+13
| | |/ / / / / / /
| | * | | | | | | Merge branch 'psimyn-issue-note-refac' into 'master'Fatih Acet2017-12-0421-78/+77
| | |\ \ \ \ \ \ \
| | | * | | | | | | issue note component renameSimon Knox2017-12-0421-78/+77
| | |/ / / / / / /
| | * | | | | | | Merge branch 'git-fsck-worker-client-prep' into 'master'Douwe Maan2017-12-042-11/+17
| | |\ \ \ \ \ \ \
| | | * | | | | | | Move SingleRepositoryWorker#fsck into Gitlab::Git::RepositoryKim "BKC" Carlbäcker2017-12-042-11/+17
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge branch 'zj-diverging-commit-count-no-rugged' into 'master'Robert Speicher2017-12-041-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Use commit finder instead of rev parseZeger-Jan van de Weg2017-12-011-1/+1
| | * | | | | | | | Merge branch 'sh-optimize-groups-api' into 'master'Douwe Maan2017-12-0418-32/+241
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed bugsh-optimize-groups-apiFrancisco Lopez2017-12-042-2/+17
View Lorry Controller Status