Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'update-namespaces-api-docs' into 'master' | Achilleas Pipinellis | 2018-02-14 | 1 | -5/+5 |
|\ | | | | | | | | | Make parent_id field integer/null value instead of string See merge request gitlab-org/gitlab-ce!17085 | ||||
| * | Make parent_id field integer/null value instead of stringupdate-namespaces-api-docs | Tomasz Maczukin | 2018-02-13 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'feature-flags-for-user-apps' into 'master' | Achilleas Pipinellis | 2018-02-14 | 1 | -1/+6 |
|\ \ | | | | | | | | | | | | | clarify what kind of feature flags we support See merge request gitlab-org/gitlab-ce!17113 | ||||
| * | | clarify what kind of feature flags we support | Job van der Voort | 2018-02-14 | 1 | -1/+6 |
| | | | |||||
* | | | Merge branch 'jramsay-i18n-proofreader-process-docs' into 'master' | Douwe Maan | 2018-02-14 | 2 | -31/+54 |
|\ \ \ | |/ / |/| | | | | | | | | Add clearer proofreader process to docs See merge request gitlab-org/gitlab-ce!17103 | ||||
| * | | Fix punctuation and address feedbackjramsay-i18n-proofreader-process-docs | James Ramsay | 2018-02-13 | 2 | -6/+8 |
| | | | |||||
| * | | Add clearer proofreader process to docs | James Ramsay | 2018-02-13 | 2 | -27/+48 |
| | | | |||||
* | | | Merge branch 'feature/include-custom-attributes-in-api' into 'master' | Douwe Maan | 2018-02-14 | 3 | -0/+20 |
|\ \ \ | | | | | | | | | | | | | | | | | Allow including custom attributes in API responses See merge request gitlab-org/gitlab-ce!16526 | ||||
| * | | | Allow including custom attributes in API responses | Markus Koller | 2018-02-08 | 3 | -0/+20 |
| | | | | |||||
* | | | | Merge branch '42934-search-api-fix' into 'master' | Sean McGivern | 2018-02-14 | 2 | -3/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about projects when searching in wiki_blobs, blobs, commits scopes Closes #42934 See merge request gitlab-org/gitlab-ce!17095 | ||||
| * | | | | API - Include project in commits&blobs search results | Jarka Kadlecová | 2018-02-14 | 2 | -3/+7 |
| | | | | | |||||
* | | | | | Merge branch '37050-ext-issue-tracker' into 'master' | Sean McGivern | 2018-02-14 | 3 | -6/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display a link to external issue tracker when enabled Closes #37050 See merge request gitlab-org/gitlab-ce!17030 | ||||
| * | | | | | Display a link to external issue tracker when enabled | Jarka Kadlecová | 2018-02-14 | 3 | -6/+4 |
| | | | | | | |||||
* | | | | | | Merge branch 'api-refs-for-commit' into 'master' | Douwe Maan | 2018-02-14 | 1 | -0/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Get refs for a particular commit Closes #18014 See merge request gitlab-org/gitlab-ce!15026 | ||||
| * | | | | | | Refactor commits/refs API to use hash and add pagination headers | Robert Schilling | 2018-02-14 | 1 | -6/+9 |
| | | | | | | | |||||
| * | | | | | | Separate branch and tag names | Robert Schilling | 2018-02-09 | 1 | -5/+4 |
| | | | | | | | |||||
| * | | | | | | Add docs | Robert Schilling | 2018-02-09 | 1 | -0/+34 |
| |/ / / / / | |||||
* | | | | | | Update database_mysql.md to remove conflicting recommendationlm-update-mysql-rec | Lee Matos | 2018-02-13 | 1 | -1/+0 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'whitelisting' into 'master' | Yorick Peterse | 2018-02-13 | 1 | -3/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove Sentry reporting for query limiting See merge request gitlab-org/gitlab-ce!17092 | ||||
| * | | | | | Remove Sentry reporting for query limiting | Yorick Peterse | 2018-02-13 | 1 | -3/+2 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Sentry, while useful, poses two problems you have to choose from: 1. All errors are reported separately, making it easy to create issues but also making it next to impossible to see other errors (due to the sheer volume of threshold errors). 2. Errors can be grouped or merged together, reducing the noise. This however also means it's (as far as I can tell) much harder to automatically create GitLab issues from Sentry for the offending controllers. Since both solutions are terrible I decided to go with a third option: not using Sentry for this at all. Instead we'll investigate using Prometheus alerts and Grafana dashboards for this, which has the added benefit of being able to more accurately measure the behaviour over time. Note that throwing errors in test environments is still enabled, and whitelisting is still necessary to prevent that from happening (and that in turn still requires that developers create issues). | ||||
* | | | | | Merge branch 'ce-rc/move-all-ee-specs-to-ee-specs' into 'master' | Robert Speicher | 2018-02-13 | 2 | -4/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Port spec/fixtures/api/schemas/deployment.json from EE See merge request gitlab-org/gitlab-ce!17090 | ||||
| * | | | | Port some RuboCop and doc changes from EE | Rémy Coutable | 2018-02-13 | 2 | -4/+7 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Update sidekiq_style_guide.mddocument-all-queues-yml | Dylan Griffith | 2018-02-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Document all_queues.yml in sidekiq_style_guide.md | Dylan Griffith | 2018-02-13 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge branch 'doc-improve-side-effects-block' into 'master' | Phil Hughes | 2018-02-09 | 1 | -2/+31 |
|\ \ \ | | | | | | | | | | | | | | | | | Improve docs about allowing some side effects on the constructor See merge request gitlab-org/gitlab-ce!17027 | ||||
| * | | | Fix english in style_guide_js.mddoc-improve-side-effects-block | Filipa Lacerda | 2018-02-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | Improve docs about allowing some side effects on the constructor | Filipa Lacerda | 2018-02-09 | 1 | -2/+31 |
| |/ / | |||||
* | | | Merge branch 'docs/update-vue-naming-guidelines' into 'master' | Phil Hughes | 2018-02-09 | 1 | -5/+5 |
|\ \ \ | |/ / |/| | | | | | | | | Update vue component naming guidelines See merge request gitlab-org/gitlab-ce!17018 | ||||
| * | | Update vue component naming guidelines | George Tsiolis | 2018-02-08 | 1 | -5/+5 |
| | | | |||||
* | | | Backport EE changes to some hashed storage documentation to CE | Nick Thomas | 2018-02-08 | 1 | -39/+52 |
|/ / | |||||
* | | Merge branch 'docs-for-commits-linking-to-mrs' into 'master' | Sean McGivern | 2018-02-08 | 1 | -1/+14 |
|\ \ | | | | | | | | | | | | | Add docs for MR link in commit page See merge request gitlab-org/gitlab-ce!16994 | ||||
| * | | Add docs for MR link in commit pagedocs-for-commits-linking-to-mrs | Sean McGivern | 2018-02-08 | 1 | -1/+14 |
| | | | |||||
* | | | Issues and merge requests in subgroups docs | Victor Wu 🌴Vacation Feb 10-18🌴 | 2018-02-08 | 2 | -6/+4 |
| | | | |||||
* | | | Merge branch 'update-docs-labels-ce' into 'master' | Marcia Ramos | 2018-02-08 | 25 | -119/+70 |
|\ \ \ | | | | | | | | | | | | | | | | | Update docs labels CE See merge request gitlab-org/gitlab-ce!16974 | ||||
| * | | | Update docs labels CE | Victor Wu 🌴Vacation Feb 10-18🌴 | 2018-02-08 | 25 | -119/+70 |
| | | | | |||||
* | | | | Merge branch 'docs-pages-https' into 'master' | Achilleas Pipinellis | 2018-02-08 | 2 | -5/+29 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Docs: bring important info from blog post to doc See merge request gitlab-org/gitlab-ce!16837 | ||||
| * | | | | wording | Marcia Ramos | 2018-02-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | un-index old blog post from doc, add the important content from the post to ↵docs-pages-https | Marcia Ramos | 2018-01-31 | 2 | -5/+29 |
| | | | | | | | | | | | | | | | | | | | | the docs | ||||
* | | | | | Merge branch 'feature/oidc-groups-claim' into 'master' | Douwe Maan | 2018-02-08 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add groups to OpenID Connect claims See merge request gitlab-org/gitlab-ce!16929 | ||||
| * | | | | | Add groups to OpenID Connect claims | Hassan Zamani | 2018-02-08 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge branch '10-5-ce-update-guides' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -0/+361 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10.5 Create the "Update" guides See merge request gitlab-org/gitlab-ce!16996 | ||||
| * | | | | | | Create update guide for 10.510-5-ce-update-guides | Mark Fletcher | 2018-02-08 | 1 | -0/+361 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch '10-5-update-source-install-guide' into 'master' | Marin Jankovski | 2018-02-08 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | 10.5 Update the "Installation from Source" guide See merge request gitlab-org/gitlab-ce!16995 | ||||
| * | | | | | Update 10.5 source install guide | Mark Fletcher | 2018-02-08 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge branch 'osw-wip-commit-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add blurb about changing MRs to WIP through commits See merge request gitlab-org/gitlab-ce!16920 | ||||
| * | | | | | Add blurb about changing MRs to WIP through commitsosw-wip-commit-docs | Oswaldo Ferreira | 2018-02-04 | 1 | -1/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'bvl-pot-merge-conflicts-docs' into 'master' | Achilleas Pipinellis | 2018-02-08 | 1 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about merge conflicts in `gitlab.pot` See merge request gitlab-org/gitlab-ce!16971 | ||||
| * | | | | | | Add a note about merge conflicts in `gitlab.pot`bvl-pot-merge-conflicts-docs | Bob Van Landuyt | 2018-02-07 | 1 | -0/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ce | Yorick Peterse | 2018-02-08 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix concurrent fork network migrations Closes #41487 See merge request gitlab-org/gitlab-ce!16988 | ||||
| * | | | | | | [docs] Info rescheduling background migrationsbvl-fix-concurrent-fork-network-migrations | Bob Van Landuyt | 2018-02-08 | 1 | -0/+12 |
| | | | | | | |