summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-versionAlessio Caiazza2018-01-042-4/+13
| | | | | | | | | This commit extracts `kubectl`, `helm` and `codeclimate` versions as CI variables. `kubectl` changes from latest stable version to `1.8.6`, the other two are just extracted in order to be easily updated; now we can also test tool upgrades overriding CI secret variables.
* Merge branch 'use-heredoc-for-keys' into 'master'Grzegorz Bizon2018-01-042-34/+43
|\ | | | | | | | | Use heredoc for long strings so it's easier to read See merge request gitlab-org/gitlab-ce!16179
| * Use heredoc for long strings so it's easier to readuse-heredoc-for-keysLin Jen-Shin2018-01-032-34/+43
| |
* | Merge branch ↵Grzegorz Bizon2018-01-043-5/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'rd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-group' into 'master' Fix API endpoints to edit wiki pages where project belongs to a group Closes #40453 See merge request gitlab-org/gitlab-ce!16170
| * | Fix API endpoints to edit wiki pages where project belongs to a grouprd-api-request-to-edit-wiki-page-fails-when-project-belongs-to-groupRubén Dávila2018-01-033-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | In some cases is prefered to manually create a ProjectWiki over using Project#wiki. This is because Project#wiki always uses the #owner (which is a User sometimes) as the author of the wiki changes but sometimes the owner is a Group and it doesn't respond to #username
* | | Merge branch ↵Kamil Trzciński2018-01-033-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-ansi2html-light-color-variant-conversion-feature' into 'master' fix issue #37843 Closes #37843 See merge request gitlab-org/gitlab-ce!15902
| * | | fix issue #37843Danny2018-01-033-1/+10
|/ / /
* | | Merge branch 'update-autodevops-template' into 'master'Kamil Trzciński2018-01-032-0/+60
|\ \ \ | | | | | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16042
| * | | Set Auto Browser Performance Testing to 10.4update-autodevops-templateJoshua Lambert2017-12-211-1/+1
| | | |
| * | | Add docs for AutoDevOpsJoshua Lambert2017-12-211-0/+15
| | | |
| * | | Merge branch 'update-autodevops-template' of gitlab.com:gitlab-org/gitlab-ce ↵Joshua Lambert2017-12-210-0/+0
| |\ \ \ | | | | | | | | | | | | | | | into update-autodevops-template
| | * | | Remove SAST:Image for now.Joshua Lambert2017-12-201-25/+0
| | | | |
| | * | | Update Auto DevOps templateJoshua Lambert2017-12-201-0/+70
| | | | |
| * | | | Remove SAST:Image for now.Joshua Lambert2017-12-211-25/+0
| | | | |
| * | | | Update Auto DevOps templateJoshua Lambert2017-12-211-0/+70
| | | | |
* | | | | Merge branch 'docs-update-doc-for-prometheus-and-kubernetes-integrations' ↵Kamil Trzciński 🎆 Back on Jan 2!2018-01-033-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Updates documentation for Prometheus and Kubernetes integration Closes #41432 See merge request gitlab-org/gitlab-ce!16156
| * | | | | Updates documentation for prometheus and kubernetes integrationdocs-update-doc-for-prometheus-and-kubernetes-integrationsMayra Cabrera2017-12-283-2/+6
| | | | | |
* | | | | | Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into ↵Robert Speicher2018-01-0318-61/+259
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle GitLab hashed storage repositories using the repo import task Closes #39870 See merge request gitlab-org/gitlab-ce!16027
| * | | | | | Use if instead of unless on Projects::HashedStorage::MigrateRepositoryServiceda-handle-hashed-storage-repos-using-repo-import-taskDouglas Barbosa Alexandre2018-01-031-3/+3
| | | | | | |
| * | | | | | Refactoring Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+6
| | | | | | |
| * | | | | | Remove unused variable from bare repository importer specDouglas Barbosa Alexandre2018-01-031-1/+0
| | | | | | |
| * | | | | | Refactoring spec for Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+11
| | | | | | |
| * | | | | | Fix Projects::TransferService#write_repository_config methodDouglas Barbosa Alexandre2018-01-031-1/+1
| | | | | | |
| * | | | | | Fix Repository#processable? to allow .git repos in the root folderDouglas Barbosa Alexandre2018-01-032-3/+10
| | | | | | |
| * | | | | | Add spec for Project#write_repository_configDouglas Barbosa Alexandre2018-01-031-0/+22
| | | | | | |
| * | | | | | Write projects config to all projects inside namespace in batchesDouglas Barbosa Alexandre2018-01-032-3/+3
| | | | | | |
| * | | | | | Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-037-41/+25
| | | | | | |
| * | | | | | Fix TestEnv.copy_repo to use disk_path instead of full_pathDouglas Barbosa Alexandre2018-01-033-3/+3
| | | | | | |
| * | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-01-031-0/+5
| | | | | | |
| * | | | | | Handle exceptions when writing to .git/configDouglas Barbosa Alexandre2018-01-031-0/+3
| | | | | | |
| * | | | | | Import directory tree created with hashed storage using import rake taskDouglas Barbosa Alexandre2018-01-034-49/+129
| | | | | | |
| * | | | | | Does not write to .git/config when importing bare repositoriesDouglas Barbosa Alexandre2018-01-031-5/+5
| | | | | | |
| * | | | | | Write project full path to .git/config when migrating legacy storageDouglas Barbosa Alexandre2018-01-032-1/+14
| | | | | | |
| * | | | | | Update project full path in .git/config when renaming namespaceDouglas Barbosa Alexandre2018-01-033-0/+23
| | | | | | |
| * | | | | | Update project full path in .git/config when transfering a projectDouglas Barbosa Alexandre2018-01-032-0/+22
| | | | | | |
| * | | | | | Update project full path in .git/config when renaming a repositoryDouglas Barbosa Alexandre2018-01-033-1/+20
| | | | | | |
| * | | | | | Write project full path to .git/config when creating projectsDouglas Barbosa Alexandre2018-01-033-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd need to keep track of project full path otherwise directory tree created with hashed storage enabled cannot be usefully imported using the import rake task.
* | | | | | | Merge branch '13355-definition-margin' into 'master'Filipa Lacerda2018-01-031-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "reStructuredText rendering of definition lists" Closes #13355 See merge request gitlab-org/gitlab-ce!16202
| * | | | | | | Add left margin to definition elements13355-definition-marginAnnabel Dunstone Gray2018-01-031-0/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'pre-commit-prettier' into 'master'Robert Speicher2018-01-034-0/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre commit prettier See merge request gitlab-org/gitlab-ce!16061
| * | | | | | | Add check if run from gitlab development kit root directory.pre-commit-prettierJacob Schatz2018-01-021-0/+7
| | | | | | | |
| * | | | | | | Check for symlink instead of file before install.Jacob Schatz2018-01-021-1/+4
| | | | | | | |
| * | | | | | | Update script to work only when run in the gitlab directory.Jacob Schatz2018-01-021-2/+13
| | | | | | | |
| * | | | | | | Remove changelogJacob Schatz2018-01-021-5/+0
| | | | | | | |
| * | | | | | | Remove `-f` to not ruin other people's existing pre-commit files.Jacob Schatz2017-12-201-1/+1
| | | | | | | |
| * | | | | | | Add changelog and newlinesJacob Schatz2017-12-203-2/+7
| | | | | | | |
| * | | | | | | Add script to enable code formattersJacob Schatz2017-12-201-0/+4
| | | | | | | |
| * | | | | | | Remove JSX since we don't use it.Jacob Schatz2017-12-201-1/+1
| | | | | | | |
| * | | | | | | Initial installJacob Schatz2017-12-203-0/+16
| | | | | | | |
* | | | | | | | Merge branch 'fix/move-2fa-disable-button' into 'master'Robert Speicher2018-01-034-7/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move 2FA disable button #35836 Closes #35836 See merge request gitlab-org/gitlab-ce!16177
View Lorry Controller Status