Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ce | blackst0ne | 2018-05-29 | 41 | -64/+840 |
* | Merge branch 'docs/fix-contributing-broken-tag' into 'master' | Rémy Coutable | 2018-05-28 | 1 | -1/+1 |
|\ | |||||
| * | "Build" team is now "Distribution" | Philippe Lafoucrière | 2018-05-28 | 1 | -1/+1 |
* | | Merge branch 'ab-45389-remove-double-checked-internal-id-generation' into 'ma... | Yorick Peterse | 2018-05-28 | 3 | -55/+11 |
|\ \ | |||||
| * | | Remove double-checked internal id generation. | Andreas Brandl | 2018-05-28 | 3 | -55/+11 |
* | | | Merge branch 'ce-6225-unify-app-views-milestones' into 'master' | Rémy Coutable | 2018-05-28 | 2 | -1/+5 |
|\ \ \ | |||||
| * | | | Bring changes from EE | Lin Jen-Shin | 2018-05-28 | 2 | -1/+5 |
* | | | | Merge branch 'add-background-migration-to-fill-file-store' into 'master' | Kamil Trzciński | 2018-05-28 | 6 | -0/+181 |
|\ \ \ \ | |||||
| * | | | | Remove disable_statement_timeoutadd-background-migration-to-fill-file-store | Shinya Maeda | 2018-05-28 | 1 | -2/+0 |
| * | | | | Remove Gitlab::BackgroundMigration exxxplicit namespaces from migration classes | Shinya Maeda | 2018-05-28 | 3 | -6/+6 |
| * | | | | Rename FillFileStoreUpload to FillStoreUpload | Shinya Maeda | 2018-05-28 | 2 | -3/+4 |
| * | | | | Add chnage log | Shinya Maeda | 2018-05-28 | 1 | -0/+5 |
| * | | | | Add spec for fill_file_store migration | Shinya Maeda | 2018-05-28 | 5 | -6/+49 |
| * | | | | Fix schema and refactoring migration file | Shinya Maeda | 2018-05-28 | 1 | -24/+26 |
| * | | | | Remove legacy artifacts file_store migration | Shinya Maeda | 2018-05-28 | 3 | -72/+6 |
| * | | | | Add background migration to fill file stores | Shinya Maeda | 2018-05-28 | 6 | -0/+198 |
* | | | | | Merge branch '38479-rename-secret-variables-to-variables' into 'master' | Kamil Trzciński | 2018-05-28 | 4 | -5/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Resolve "Rename "secret variables" to "variables"" | Fabio Busatto | 2018-05-28 | 4 | -5/+5 |
|/ / / / / | |||||
* | | | | | Merge branch 'patch-28' into 'master' | Kamil Trzciński | 2018-05-28 | 5 | -4/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Add changelog | Shinya Maeda | 2018-05-28 | 1 | -0/+5 |
| * | | | | | Fix spec | Shinya Maeda | 2018-05-28 | 3 | -3/+3 |
| * | | | | | Update object_storage.rb | Shinya Maeda | 2018-05-28 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge branch 'leipert-forward-bootstrap4' into 'master' | Filipa Lacerda | 2018-05-28 | 2 | -4/+4 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Update bootstrap to 4.1.1 | Lukas Eipert | 2018-05-28 | 2 | -4/+4 |
* | | | | | Merge branch 'docs/redirect-k8s-service-page' into 'master' | Marcia Ramos | 2018-05-28 | 7 | -282/+14 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Deprecate the Kubernetes service docsdocs/redirect-k8s-service-page | Achilleas Pipinellis | 2018-05-09 | 7 | -282/+14 |
* | | | | | Merge branch 'leipert-backport-bs4-merge-conflict' into 'master' | Fatih Acet | 2018-05-28 | 1 | -6/+4 |
|\ \ \ \ \ | |||||
| * | | | | | backport EE version of | Lukas Eipert | 2018-05-28 | 1 | -6/+4 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'leipert-dedupe-yarn-2018-05-27' into 'master' | Fatih Acet | 2018-05-28 | 1 | -273/+34 |
|\ \ \ \ \ | |||||
| * | | | | | Dedupe yarn dependencies | Lukas Eipert | 2018-05-28 | 1 | -273/+34 |
|/ / / / / | |||||
* | | | | | Merge branch 'patch-23' into 'master' | Achilleas Pipinellis | 2018-05-28 | 1 | -10/+1 |
|\ \ \ \ \ | |||||
| * | | | | | use postgres_role | Ben Bodenmiller | 2018-05-16 | 1 | -10/+1 |
* | | | | | | Merge branch 'patch-22' into 'master' | Achilleas Pipinellis | 2018-05-28 | 1 | -12/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | cleanup application server setup | Ben Bodenmiller | 2018-05-28 | 1 | -12/+12 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'ignore-writing-trace-if-it-already-archived' into 'master' | Kamil Trzciński | 2018-05-28 | 3 | -2/+23 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add changelogignore-writing-trace-if-it-already-archived | Shinya Maeda | 2018-05-28 | 1 | -0/+5 |
| * | | | | | | Revise spec context wording | Shinya Maeda | 2018-05-28 | 1 | -1/+1 |
| * | | | | | | Add spec | Shinya Maeda | 2018-05-28 | 1 | -0/+15 |
| * | | | | | | Revert correctly | Shinya Maeda | 2018-05-28 | 2 | -6/+6 |
| * | | | | | | Disallow updating job stauts if it's not running | Shinya Maeda | 2018-05-28 | 1 | -0/+1 |
| * | | | | | | Revert trace change | Shinya Maeda | 2018-05-28 | 1 | -3/+1 |
| * | | | | | | Ignore writing traces if it's already been archived | Shinya Maeda | 2018-05-28 | 1 | -1/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'sh-fix-admin-page-counts-take-2' into 'master' | Yorick Peterse | 2018-05-28 | 7 | -65/+130 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2 | Stan Hu | 2018-05-25 | 7 | -65/+130 |
* | | | | | | | Merge branch 'gitaly-backup-restore-delete-repositories' into 'master' | Douwe Maan | 2018-05-28 | 6 | -24/+89 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use Gitaly's DeleteAllRepositories RPC during backup restore | Jacob Vosmaer (GitLab) | 2018-05-28 | 6 | -24/+89 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'bvl-add-username-to-terms-message' into 'master' | Douwe Maan | 2018-05-28 | 5 | -7/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add username to terms message in git and API callsbvl-add-username-to-terms-message | Bob Van Landuyt | 2018-05-24 | 5 | -7/+13 |
* | | | | | | | | Merge branch '46846-update-redis-namespace-to-1-6-0' into 'master' | Rémy Coutable | 2018-05-28 | 3 | -4/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update redis-namespace to 1.6.0 | Takuya Noguchi | 2018-05-26 | 3 | -4/+9 |