Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix/gb/fix-import-export-restoring-associations | Grzegorz Bizon | 2018-01-06 | 19 | -35/+396 |
|\ | | | | | | | * master: (114 commits) | ||||
| * | Update installation.md for 10.4.0.rc1 | LUKE BENNETT | 2018-01-06 | 1 | -2/+2 |
| | | |||||
| * | API: get participants from merge_requests & issues | Brent Greeff | 2018-01-05 | 2 | -0/+74 |
| | | |||||
| * | Merge branch 'jprovazn-rebase' into 'master' | Filipa Lacerda | 2018-01-05 | 3 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071 | ||||
| | * | Backport 'Rebase' feature from EE to CEjprovazn-rebase | Jan Provaznik | 2018-01-05 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301 | ||||
| * | | Merge branch 'docs/qa/gb/document-integration-tests-in-merge-requests' into ↵ | Rémy Coutable | 2018-01-05 | 3 | -0/+91 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add docs about end-to-end testing / GitLab QA tests Closes #39637 See merge request gitlab-org/gitlab-ce!16043 | ||||
| | * | | Rephrase paragraph about e2e tests in merge requests in docs | Grzegorz Bizon | 2018-01-05 | 1 | -8/+6 |
| | | | | |||||
| | * | | Copy-edit end-to-end testing guide documentationdocs/qa/gb/document-integration-tests-in-merge-requests | Grzegorz Bizon | 2018-01-04 | 1 | -16/+18 |
| | | | | |||||
| | * | | Fix link to end-to-end testing docs from test pyramid | Grzegorz Bizon | 2018-01-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Copy-edit end-to-end testing guidelines | Grzegorz Bizon | 2018-01-02 | 1 | -13/+18 |
| | | | | |||||
| | * | | Link to end to end test guideline from test pyramid | Grzegorz Bizon | 2018-01-02 | 1 | -0/+3 |
| | | | | |||||
| | * | | Extend documentation on end-to-end integration tests | Grzegorz Bizon | 2018-01-02 | 2 | -9/+42 |
| | | | | |||||
| | * | | Add docs about end-to-end testing / GitLab QA tests | Grzegorz Bizon | 2018-01-02 | 2 | -0/+50 |
| | | | | |||||
| * | | | Merge branch 'api-domains-expose-project_id' into 'master' | Dmitriy Zaporozhets | 2018-01-05 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Expose project_id on /api/v4/pages/domains See merge request gitlab-org/gitlab-ce!16200 | ||||
| | * | | | Expose project_id on /api/v4/pages/domains | Luc Didry | 2018-01-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'backport-issue_3413' into 'master' | Sean McGivern | 2018-01-05 | 1 | -17/+98 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194 | ||||
| | * | | | | Remove EE only sections from docsbackport-issue_3413 | Felipe Artur | 2018-01-05 | 1 | -85/+0 |
| | | | | | | |||||
| | * | | | | EE-BACKPORT group boards | Felipe Artur | 2018-01-04 | 1 | -17/+183 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2018-01-05 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update settings.md See merge request gitlab-org/gitlab-ce!16233 | ||||
| | * | | | | Update settings.md | Gauthier Wallet | 2018-01-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Allow local tests to use a modified Gitaly | Jacob Vosmaer (GitLab) | 2018-01-05 | 1 | -0/+23 |
| | | | | | | |||||
| * | | | | | Merge branch '40228-verify-integrity-of-repositories' into 'master' | Sean McGivern | 2018-01-05 | 1 | -2/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Verify integrity of repositories" Closes #40228 See merge request gitlab-org/gitlab-ce!15931 | ||||
| | * | | | | | Update check.md | James Lopez | 2018-01-05 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | add deprecation and removal issue to docs | James Lopez | 2018-01-05 | 1 | -0/+9 |
| | | | | | | | |||||
| | * | | | | | refactor spec, add docs | James Lopez | 2018-01-04 | 1 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'feature/api_runners_online' into 'master' | Rémy Coutable | 2018-01-05 | 1 | -9/+31 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add online attribute to runner api entity Closes #25774 See merge request gitlab-org/gitlab-ce!11750 | ||||
| | * | | | | Add status attribute to runner api entity | Alessio Caiazza | 2018-01-05 | 1 | -6/+17 |
| | | | | | | |||||
| | * | | | | Add online attribute to runner api entity | Alessio Caiazza | 2018-01-03 | 1 | -9/+20 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'docs-update-kubernetes-documentation' into 'master' | Kamil Trzciński | 2018-01-04 | 3 | -2/+5 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Update Kubernetes service documentation See merge request gitlab-org/gitlab-ce!16212 | ||||
| | * | | | Update Kubernetes service documentationdocs-update-kubernetes-documentation | Mayra Cabrera | 2018-01-03 | 3 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | States this service was deprecated on 10.3 and his behavior depends on the kubernetes service status. Also includes a link for the release post for more information. | ||||
| * | | | | Merge branch 'change-issues-closed-at-background-migration' into 'master' | Sean McGivern | 2018-01-04 | 1 | -0/+57 |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Use a background migration for migrating issues.closed_at See merge request gitlab-org/gitlab-ce!16083 | ||||
| | * | | | Use a background migration for issues.closed_atchange-issues-closed-at-background-migration | Yorick Peterse | 2018-01-03 | 1 | -0/+57 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous attempt (rolled back in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16021) we tried to migrate `issues.closed_at` from timestamp to timestamptz using a regular migration. This has a bad impact on GitLab.com and as such was rolled back. This commit re-implements the original migrations using generic background migrations, allowing us to still migrate the data in a single release but without a negative impact on availability. To ensure the database schema is up to date the background migrations are performed inline in development and test environments. We also make sure to not migrate that that doesn't need migrating in the first place or has already been migrated. | ||||
* | | | | Bump import/export version to 2.2.0 | Grzegorz Bizon | 2018-01-05 | 1 | -1/+2 |
|/ / / | | | | | | | | | | | | | We need to bump import/export version because we introduced a new object's hierarchy that is not backwards compatible. | ||||
* | | | Merge branch 'update-autodevops-template' into 'master' | Kamil Trzciński | 2018-01-03 | 1 | -0/+15 |
|\ \ \ | | | | | | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16042 | ||||
| * | | | Set Auto Browser Performance Testing to 10.4update-autodevops-template | Joshua Lambert | 2017-12-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add docs for AutoDevOps | Joshua Lambert | 2017-12-21 | 1 | -0/+15 |
| | | | | |||||
* | | | | Merge branch 'docs-update-doc-for-prometheus-and-kubernetes-integrations' ↵ | Kamil Trzciński 🎆 Back on Jan 2! | 2018-01-03 | 3 | -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-integrations | Mayra Cabrera | 2017-12-28 | 3 | -2/+6 |
| | | | | |||||
* | | | | Align chart docs with readmealign-chart-docs | Joshua Lambert | 2018-01-03 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add documents for GitLab utilitiesdocs-gitlab-utilities | Lin Jen-Shin | 2018-01-02 | 2 | -0/+93 |
| |_|/ |/| | | |||||
* | | | Typos correction on the advise of @smcgivern | Edouard | 2017-12-29 | 1 | -4/+4 |
| | | | |||||
* | | | Documenting that resolved JIRA tickets are not automatically transitioned | Edouard | 2017-12-29 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'patch-11' into 'master' | Robert Speicher | 2017-12-28 | 1 | -8/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | doc/plantuml.md: use html tags so code fence example would work [ci skip] See merge request gitlab-org/gitlab-ce!16026 | ||||
| * | | | plantuml.md: use html tags so code fence example would work | Elan Ruusamäe | 2017-12-27 | 1 | -8/+10 |
| | | | | |||||
* | | | | Table flip quick action docs | Victor Wu | 2017-12-28 | 1 | -0/+2 |
| |/ / |/| | | |||||
* | | | Update code_climate recommended usage. | Jonathan Duck | 2017-12-25 | 1 | -2/+1 |
| | | | |||||
* | | | Merge branch '32364-updating-slack-notification-not-working-by-api' into ↵ | Rémy Coutable | 2017-12-23 | 1 | -66/+258 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Updating Slack Notification not working by API" Closes #32364 et #22306 See merge request gitlab-org/gitlab-ce!11435 | ||||
| * | | | Add Microsoft Teams Service API docs | Mark Fletcher | 2017-12-22 | 1 | -0/+34 |
| | | | | |||||
| * | | | Add Prometheus Service API docs | Mark Fletcher | 2017-12-22 | 1 | -0/+34 |
| | | | | |||||
| * | | | Add Bugzilla Service API docs | Mark Fletcher | 2017-12-22 | 1 | -0/+38 |
| | | | |