summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update index.mdpatch-30Ray Paik2018-10-181-74/+2
|
* Merge branch 'sh-add-audit-logging-json-ce' into 'master'Stan Hu2018-10-185-4/+76
|\ | | | | | | | | Add support for JSON logging for audit events See merge request gitlab-org/gitlab-ce!22471
| * Add support for JSON logging for audit eventsStan Hu2018-10-185-4/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will add audit_json.log that writes one line per audit event. For example: { "severity":"INFO", "time":"2018-10-17T17:38:22.523Z", "author_id":3, "entity_id":2, "entity_type":"Project", "change":"visibility", "from":"Private", "to":"Public", "author_name":"John Doe4", "target_id":2, "target_type":"Project", "target_details":"namespace2/project2" }
* | Merge branch 'winh-prettier-job-app' into 'master'Clement Ho2018-10-181-145/+145
|\ \ | | | | | | | | | | | | Make app/assets/javascripts/jobs/components/job_app.vue prettier See merge request gitlab-org/gitlab-ce!22463
| * | Make app/assets/javascripts/jobs/components/job_app.vue prettierWinnie Hellmann2018-10-181-145/+145
| | |
* | | Merge branch '43422-Update-images-in-group-docs' into 'master'Achilleas Pipinellis2018-10-189-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revised images in group docs to address gitlab-org/gitlab-ce#43422 Closes #43422 See merge request gitlab-org/gitlab-ce!22031
| * | | Revised images in group docs to address gitlab-org/gitlab-ce#43422Marc Schwede2018-10-189-0/+5
|/ / /
* | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-181-1/+1
|\ \ \ | |_|/ |/| | | | | | | | Fix param typo in Notes documentation See merge request gitlab-org/gitlab-ce!22406
| * | Fix param typo in notes.mdArtur Pomadowski2018-10-161-1/+1
| | |
* | | Merge branch 'patch-29' into 'master'Achilleas Pipinellis2018-10-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Should be `start_in` not `start_key` See merge request gitlab-org/gitlab-ce!22422
| * | | Should be `start_in` not `start_key`Shane A. Stillwell2018-10-171-1/+1
| | | |
* | | | Merge branch 'sh-associate-rakefile-ruby' into 'master'Clement Ho2018-10-182-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Associate Rakefile with Ruby icon in diffs Closes #52654 See merge request gitlab-org/gitlab-ce!22341
| * | | | Associate Rakefile with Ruby icon in diffsStan Hu2018-10-132-3/+7
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52654
* | | | | Merge branch 'fix-repocheck-doc-heading-link' into 'master'Stan Hu2018-10-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | repository check doc: fix a broken link See merge request gitlab-org/gitlab-ce!22444
| * | | | | repository check doc: fix a broken linkÆvar Arnfjörð Bjarmason2018-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The link to the repocheck.log section of the logs documentation was added in 7d9191eeff9 ("Small documentation reformatting and updates", 2018-04-23), but seemingly never worked. The markdown formatter turns "." into "-" in headings. See https://docs.gitlab.com/ee/administration/repository_checks.html#what-to-do-if-a-check-failed which has a broken link to https://docs.gitlab.com/ee/administration/logs.html#repocheck.log linking to https://docs.gitlab.com/ee/administration/logs.html#repocheck-log instead (just change "." to "-") fixes it.
* | | | | | Merge branch 'jarv/update-docs' into 'master'Stan Hu2018-10-181-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove beta status on hashed storage and reference to production readiness review. See merge request gitlab-org/gitlab-ce!22457
| * | | | | | Update repository_storage_types.mdJohn Jarvis2018-10-181-4/+1
| | | | | | |
* | | | | | | Merge branch 'update-readme-ruby-version' into 'master'Stan Hu2018-10-182-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README ruby version 2.3->2.4 See merge request gitlab-org/gitlab-ce!22466
| * | | | | | | Adding changelog entryJ.D. Bean2018-10-181-0/+5
| | | | | | | |
| * | | | | | | Update README ruby version 2.3->2.4J.D. Bean2018-10-181-1/+1
| | | | | | | |
* | | | | | | | Merge branch '52855-use-monotonic-time-in-webhooks' into 'master'Stan Hu2018-10-181-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use monotonic time in computing web hook execution time Closes #52855 See merge request gitlab-org/gitlab-ce!22448
| * | | | | | | | Use monotonic time in computing web hook execution timeHeinrich Lee Yu2018-10-181-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '52886-fix-broken-master' into 'master'Phil Hughes2018-10-182-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes broken test in master for ci status bagde Closes #52886 See merge request gitlab-org/gitlab-ce!22465
| * | | | | | | | Fixes broken test in master for ci status bagdeFilipa Lacerda2018-10-182-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'bw-fix-hamllint' into 'master'Robert Speicher2018-10-181-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple spring rake commands cause "NameError: uninitialized constant HamlLint::Linter" Closes #52843 See merge request gitlab-org/gitlab-ce!22437
| * | | | | | | | | Fix uninitialized constant HamlLint::LinterBrett Walker2018-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running multiple `rake` commands with `spring', such as `spring rake db:rollback` could cause a `NameError: uninitialized constant HamlLint::Linter`
* | | | | | | | | | Merge branch 'docs/remove-link-to-self' into 'master'Achilleas Pipinellis2018-10-181-7/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove broken link See merge request gitlab-org/gitlab-ce!22284
| * | | | | | | | | | Remove broken linkEvan Read2018-10-111-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - And minor linting fixes.
* | | | | | | | | | | Merge branch 'nurtch-docs-link' into 'master'Achilleas Pipinellis2018-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to Nurtch doc site. See merge request gitlab-org/gitlab-ce!22399
| * | | | | | | | | | | Link to Nurtch doc site.Daniel Gruesso2018-10-161-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rails5-fix-deployment-spec' into 'master'Douglas Barbosa Alexandre2018-10-182-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: fix deployment model spec See merge request gitlab-org/gitlab-ce!22428
| * | | | | | | | | | | | Rails5: fix deployment model specJasper Maes2018-10-172-1/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs-fix-qa-resource-api-fabrication' into 'master'Rémy Coutable2018-10-181-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Fix resource API fabrication documentation See merge request gitlab-org/gitlab-ce!22461
| * | | | | | | | | | | | | [QA] Fix resource API fabrication documentationRémy Coutable2018-10-181-7/+5
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The precedence of methods to fetch a product's attribute value was changed recently: 1. API response 2. Web UI block 3. Inheritance from the factory 4. Raise a `QA::Factory::Product::NoValueError` error otherwise
* | | | | | | | | | | | | Merge branch 'docs/troubleshooting-docs-ra' into 'master'Marcia Ramos2018-10-181-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split troubleshooting docs review apps in own section See merge request gitlab-org/gitlab-ce!22462
| * | | | | | | | | | | | Split troubleshooting docs review apps in own sectionAchilleas Pipinellis2018-10-181-10/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs-feedback-section' into 'master'Achilleas Pipinellis2018-10-181-3/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Documents "help and feedback" section and Disqus See merge request gitlab-org/gitlab-ce!22455
| * | | | | | | | | | | | | Documents help and feedback section and DisqusMarcia Ramos2018-10-181-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Links to MRs that introduced them - Explains how to omit them - Follows https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/341
* | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2018-10-186-11/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50728-re-arrange-help-related-user-menu-items-into-new-help-menu' into 'master' Resolve "Re-arrange help-related user menu items into new Help menu" Closes #50728 See merge request gitlab-org/gitlab-ce!22195
| * | | | | | | | | | | | | Resolve "Re-arrange help-related user menu items into new Help menu"Dennis Tang2018-10-186-11/+19
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '48731-show-empty-state-on-wiki-only-projects' into 'master'Annabel Dunstone Gray2018-10-183-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show wiki empty state layout on wiki-only project overview page Closes #48731 See merge request gitlab-org/gitlab-ce!22262
| * | | | | | | | | | | | | Show wiki empty state layout on wiki-only project overview pageJacques Erasmus2018-10-183-8/+23
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '49692-trim-MR-template' into 'master'Yorick Peterse2018-10-181-10/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim database changes MR template and require up-to-date description before sending an MR for review See merge request gitlab-org/gitlab-ce!21021
| * | | | | | | | | | | | Update database changes MR templateMark Lapierre2018-10-161-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the database changes MR template to match the default template. Items from the general checklist were removed and a reminder was added to keep the description up-to-date.
* | | | | | | | | | | | | Merge branch 'qa-nightly-26' into 'master'Rémy Coutable2018-10-184-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [QA] Fix the 'clone using deploy key' tests Closes gitlab-org/quality/nightly#26 See merge request gitlab-org/gitlab-ce!22445
| * | | | | | | | | | | | | [QA] Fix the 'clone using deploy key' testsRémy Coutable2018-10-184-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | Merge branch 'ml-qa-code-owners' into 'master'Rémy Coutable2018-10-184-1/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Add support for pushing and viewing files See merge request gitlab-org/gitlab-ce!21911
| * | | | | | | | | | | | | | Add support for pushing and viewing filesMark Lapierre2018-10-174-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MR below adds a test for the code owners feature. This adds the part of those changes specific to CE - the ability to add and view files in a project. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7368
* | | | | | | | | | | | | | | Merge branch 'change-generating-url-functions' into 'master'Rémy Coutable2018-10-182-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change generating url functions for external url See merge request gitlab-org/gitlab-ce!22389
| * | | | | | | | | | | | | | | change generating url functions for external urlbenjamin2018-10-162-2/+2
| | | | | | | | | | | | | | | |