Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master' | Robert Speicher | 2018-01-11 | 3 | -24/+53 |
|\ | |||||
| * | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitaly | Ahmad Sherif | 2018-01-10 | 3 | -24/+53 |
* | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master' | Robert Speicher | 2018-01-11 | 3 | -59/+133 |
|\ \ | |||||
| * | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitaly | Ahmad Sherif | 2018-01-10 | 3 | -59/+133 |
| |/ | |||||
* | | Merge branch 'sh-remove-import-retry-count-warning' into 'master' | Robert Speicher | 2018-01-11 | 1 | -2/+2 |
|\ \ | |||||
| * | | Remove warning noise in ProjectImportOptions | Stan Hu | 2018-01-11 | 1 | -2/+2 |
* | | | Merge branch 'dispatcher-dashboard-mr' into 'master' | Fatih Acet | 2018-01-11 | 2 | -3/+10 |
|\ \ \ | |||||
| * | | | Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mr | Clement Ho | 2018-01-10 | 1 | -1/+0 |
| * | | | Refactor dispatcher dashboard mr path | Clement Ho | 2018-01-10 | 2 | -2/+10 |
* | | | | Merge branch 'dispatcher-boards' into 'master' | Fatih Acet | 2018-01-11 | 2 | -2/+11 |
|\ \ \ \ | |||||
| * | | | | Refactor dispatcher project boards pathdispatcher-boards | Clement Ho | 2018-01-10 | 2 | -2/+11 |
| |/ / / | |||||
* | | | | Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master' | Fatih Acet | 2018-01-11 | 2 | -6/+12 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-language | Eric Eastwood | 2018-01-11 | 2 | -6/+12 |
* | | | | Merge branch '41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master... | Annabel Dunstone Gray | 2018-01-11 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Remove wrong padding from pipelines.scss41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master | Winnie Hellmann | 2017-12-18 | 1 | -1/+0 |
* | | | | | Merge branch 'main-js-tidy-up' into 'master' | Filipa Lacerda | 2018-01-11 | 49 | -140/+145 |
|\ \ \ \ \ | |||||
| * | | | | | Tidy up main JS filemain-js-tidy-up | Phil Hughes | 2018-01-10 | 49 | -140/+145 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Luke Bennett | 2018-01-11 | 550 | -6993/+10355 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch '41607-require-rsync-docs' into 'master' | Achilleas Pipinellis | 2018-01-11 | 3 | -5/+20 |
| |\ \ \ \ \ | |||||
| | * | | | | | Document that we need rsync for backing up | Lin Jen-Shin | 2018-01-12 | 3 | -5/+20 |
| * | | | | | | Merge branch 'docs-move-article-laravel-envoy' into 'master' | Achilleas Pipinellis | 2018-01-11 | 19 | -682/+687 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Docs: move article "Laravel and Envoy w/ CI/CD" | Marcia Ramos | 2018-01-11 | 19 | -682/+687 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'docs-move-article-openshift' into 'master' | Achilleas Pipinellis | 2018-01-11 | 19 | -512/+512 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | move article to its topic-related dir, update linksdocs-move-article-openshift | Marcia Ramos | 2018-01-10 | 19 | -512/+512 |
| * | | | | | | Merge branch 'docs/add-aws-reference-diagram' into 'master' | Achilleas Pipinellis | 2018-01-11 | 2 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Port gitlab-ee MR 3981 to CEdocs/add-aws-reference-diagram | Brendan O'Leary | 2018-01-10 | 2 | -0/+4 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'docs-fix-api-snippets-docs' into 'master' | Achilleas Pipinellis | 2018-01-11 | 1 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix external links in Snippets API documentation | Mark Fletcher | 2018-01-11 | 1 | -2/+3 |
| * | | | | | | | Merge branch 'docs-update-EFS-HA-note' into 'master' | Achilleas Pipinellis | 2018-01-11 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Recommend against the use of EFSdocs-update-EFS-HA-note | Cindy Pallares 🦉 | 2018-01-11 | 1 | -1/+3 |
| * | | | | | | | | Merge branch 'help-profiles-dispatcher-refactor' into 'master' | Phil Hughes | 2018-01-11 | 4 | -11/+24 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactor | Constance Okoghenun | 2018-01-11 | 384 | -5752/+8191 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Removed experimental feature flag unsed depenecy for profiles/preferences | Constance Okoghenun | 2018-01-11 | 2 | -9/+3 |
| | * | | | | | | | | Refactored profile:* and help:* imports in dispatcher | Constance Okoghenun | 2018-01-09 | 5 | -6/+27 |
| * | | | | | | | | | Merge branch '18040-line-breaks-around-conditional-blocks' into 'master' | Robert Speicher | 2018-01-11 | 109 | -0/+673 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Adds Rubocop rule for line break around conditionals | 🙈 jacopo beschi 🙉 | 2018-01-11 | 109 | -0/+673 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'sh-filter-build-trace-params' into 'master' | Robert Speicher | 2018-01-11 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Filter out build traces from logged parameters | Stan Hu | 2018-01-11 | 1 | -0/+2 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'projects-dispatcher-refactor' into 'master' | Phil Hughes | 2018-01-11 | 4 | -20/+42 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Refactored project:n* imports in dispatcher.js | Constance Okoghenun | 2018-01-11 | 4 | -20/+42 |
| * | | | | | | | | | | Merge branch 'remove-soft-removals' into 'master' | Douwe Maan | 2018-01-11 | 39 | -105/+337 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Added tests for removing soft removed objectsremove-soft-removals | Yorick Peterse | 2018-01-10 | 2 | -12/+87 |
| | * | | | | | | | | | Remove soft removals related code | Yorick Peterse | 2018-01-08 | 38 | -105/+262 |
| * | | | | | | | | | | Merge branch '40920-emphasize-irreversibility-in-warning-message-when-promoti... | Annabel Dunstone Gray | 2018-01-11 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Changed copy text for promoting the milestone and labels40920-emphasize-irreversibility-in-warning-message-when-promoting-labels-and-milestones | Jose Ivan Vargas | 2018-01-10 | 3 | -3/+3 |
| * | | | | | | | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master' | Rémy Coutable | 2018-01-11 | 3 | -45/+85 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Migrate merged_branch_names to Gitaly | Ahmad Sherif | 2018-01-11 | 3 | -45/+85 |
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'option-disable-archive-cache' into 'master' | Sean McGivern | 2018-01-11 | 3 | -1/+22 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Add option to disable git archive caching in workhorseoption-disable-archive-cache | Jacob Vosmaer | 2018-01-09 | 3 | -1/+22 |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'qa/gb/define-project-pages-selectors' into 'master' | Rémy Coutable | 2018-01-11 | 6 | -19/+31 |
| |\ \ \ \ \ \ \ \ \ \ |