summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-113-24/+53
|\
| * Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-103-24/+53
* | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-113-59/+133
|\ \
| * | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-103-59/+133
| |/
* | Merge branch 'sh-remove-import-retry-count-warning' into 'master'Robert Speicher2018-01-111-2/+2
|\ \
| * | Remove warning noise in ProjectImportOptionsStan Hu2018-01-111-2/+2
* | | Merge branch 'dispatcher-dashboard-mr' into 'master'Fatih Acet2018-01-112-3/+10
|\ \ \
| * | | Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mrClement Ho2018-01-101-1/+0
| * | | Refactor dispatcher dashboard mr pathClement Ho2018-01-102-2/+10
* | | | Merge branch 'dispatcher-boards' into 'master'Fatih Acet2018-01-112-2/+11
|\ \ \ \
| * | | | Refactor dispatcher project boards pathdispatcher-boardsClement Ho2018-01-102-2/+11
| |/ / /
* | | | Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master'Fatih Acet2018-01-112-6/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-languageEric Eastwood2018-01-112-6/+12
* | | | Merge branch '41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master...Annabel Dunstone Gray2018-01-111-1/+0
|\ \ \ \
| * | | | Remove wrong padding from pipelines.scss41221-padding-is-wrong-for-pipeline-dropdowns-on-current-masterWinnie Hellmann2017-12-181-1/+0
* | | | | Merge branch 'main-js-tidy-up' into 'master'Filipa Lacerda2018-01-1149-140/+145
|\ \ \ \ \
| * | | | | Tidy up main JS filemain-js-tidy-upPhil Hughes2018-01-1049-140/+145
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceLuke Bennett2018-01-11550-6993/+10355
|\ \ \ \ \
| * \ \ \ \ Merge branch '41607-require-rsync-docs' into 'master'Achilleas Pipinellis2018-01-113-5/+20
| |\ \ \ \ \
| | * | | | | Document that we need rsync for backing upLin Jen-Shin2018-01-123-5/+20
| * | | | | | Merge branch 'docs-move-article-laravel-envoy' into 'master'Achilleas Pipinellis2018-01-1119-682/+687
| |\ \ \ \ \ \
| | * | | | | | Docs: move article "Laravel and Envoy w/ CI/CD"Marcia Ramos2018-01-1119-682/+687
| | |/ / / / /
| * | | | | | Merge branch 'docs-move-article-openshift' into 'master'Achilleas Pipinellis2018-01-1119-512/+512
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | move article to its topic-related dir, update linksdocs-move-article-openshiftMarcia Ramos2018-01-1019-512/+512
| * | | | | | Merge branch 'docs/add-aws-reference-diagram' into 'master'Achilleas Pipinellis2018-01-112-0/+4
| |\ \ \ \ \ \
| | * | | | | | Port gitlab-ee MR 3981 to CEdocs/add-aws-reference-diagramBrendan O'Leary2018-01-102-0/+4
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'docs-fix-api-snippets-docs' into 'master'Achilleas Pipinellis2018-01-111-2/+3
| |\ \ \ \ \ \
| | * | | | | | Fix external links in Snippets API documentationMark Fletcher2018-01-111-2/+3
| * | | | | | | Merge branch 'docs-update-EFS-HA-note' into 'master'Achilleas Pipinellis2018-01-111-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Recommend against the use of EFSdocs-update-EFS-HA-noteCindy Pallares 🦉2018-01-111-1/+3
| * | | | | | | | Merge branch 'help-profiles-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-11/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactorConstance Okoghenun2018-01-11384-5752/+8191
| | |\ \ \ \ \ \ \
| | * | | | | | | | Removed experimental feature flag unsed depenecy for profiles/preferencesConstance Okoghenun2018-01-112-9/+3
| | * | | | | | | | Refactored profile:* and help:* imports in dispatcherConstance Okoghenun2018-01-095-6/+27
| * | | | | | | | | Merge branch '18040-line-breaks-around-conditional-blocks' into 'master'Robert Speicher2018-01-11109-0/+673
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-11109-0/+673
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'sh-filter-build-trace-params' into 'master'Robert Speicher2018-01-111-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Filter out build traces from logged parametersStan Hu2018-01-111-0/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'projects-dispatcher-refactor' into 'master'Phil Hughes2018-01-114-20/+42
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Refactored project:n* imports in dispatcher.jsConstance Okoghenun2018-01-114-20/+42
| * | | | | | | | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1139-105/+337
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Added tests for removing soft removed objectsremove-soft-removalsYorick Peterse2018-01-102-12/+87
| | * | | | | | | | | Remove soft removals related codeYorick Peterse2018-01-0838-105/+262
| * | | | | | | | | | Merge branch '40920-emphasize-irreversibility-in-warning-message-when-promoti...Annabel Dunstone Gray2018-01-113-3/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Changed copy text for promoting the milestone and labels40920-emphasize-irreversibility-in-warning-message-when-promoting-labels-and-milestonesJose Ivan Vargas2018-01-103-3/+3
| * | | | | | | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'Rémy Coutable2018-01-113-45/+85
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-113-45/+85
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'option-disable-archive-cache' into 'master'Sean McGivern2018-01-113-1/+22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-093-1/+22
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'qa/gb/define-project-pages-selectors' into 'master'Rémy Coutable2018-01-116-19/+31
| |\ \ \ \ \ \ \ \ \ \