summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use existing BUNDLE_PATH for gitaly in local testsgitaly-test-bundle-pathJacob Vosmaer2017-08-112-7/+22
|
* Merge branch '36270-collapsed-sidebar-scroll' into 'master'Phil Hughes2017-08-111-0/+1
|\ | | | | | | | | | | | | Remove horizontal scroll on collapsed sidebar Closes #36270 See merge request !13458
| * Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scrollAnnabel Dunstone Gray2017-08-101-0/+1
| |
* | Merge branch 'fix-typos' into 'master'36327-tooltipRémy Coutable2017-08-113-4/+4
|\ \ | | | | | | | | | | | | | | | | | | Fix minor typos in views Closes #36317 See merge request !13487
| * | Fix minor typos in viewsMehdi Lahmam2017-08-113-4/+4
| | | | | | | | | | | | Closes #36317.
* | | Merge branch 'docs-update-docs' into 'master'Achilleas Pipinellis2017-08-112-59/+33
|\ \ \ | |/ / |/| | | | | | | | Docs: update user docs index See merge request !13471
| * | Docs: update user docs indexMarcia Ramos2017-08-112-59/+33
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-08-10170-696/+1246
|\ \
| * \ Merge branch '36192-change-ha-docs-to-update-using-efs-as-nfs' into 'master'Stan Hu2017-08-101-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Change HA docs to update using EFS as NFS" Closes #36192 See merge request !13400
| | * | Update nfs.md with information on AWS EFS and Burst Credit usage and how to ↵36192-change-ha-docs-to-update-using-efs-as-nfsJohn Woods2017-08-081-0/+4
| | | | | | | | | | | | | | | | increase Burst Credit limits and also limit the need for AWS to access EFS by using FS Cache.
| * | | Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_specRobert Speicher2017-08-101-1/+1
| | | |
| * | | Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-106-1/+61
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Security release 2017-08-10 patch See merge request !13477
| | * | | Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-103-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | Ensure user and hostnames begin with an alnum character in UrlBlocker See merge request !2138
| | * | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-103-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Fix file disclosure via hidden symlinks using the project import (9.3) See merge request !2164
| * | | | Merge branch 'filter-nginx-access-logs' into 'master'Robert Speicher2017-08-102-3/+71
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter sensitive query string parameters from NGINX access logs Closes #19203 See merge request !13453
| | * | | | Filter sensitive query string parameters from NGINX access logsNick Thomas2017-08-102-3/+71
| | |/ / /
| * | | | Merge branch '21949-add-type-to-changelog' into 'master'Robert Speicher2017-08-104-75/+215
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's start labeling our CHANGELOG entries Closes #21949 See merge request !11579
| | * | | | Let's start labeling our CHANGELOG entriesJacopo2017-07-224-75/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the type attribute to a CHANGELOG entry. When you create a new entry the software asks for the category of the change and sets the associated type in the file.
| * | | | | Merge branch 'rc/improve-projects-factory' into 'master'Robert Speicher2017-08-106-196/+130
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the Project factory to make `creator` defaults to `namespace.owner` See merge request !13412
| | * | | | | Fix and improve spec/controllers/autocomplete_controller_spec.rbrc/improve-projects-factoryRémy Coutable2017-08-101-77/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | | | Improve the Project factory to make `creator` defaults to namespace.ownerRémy Coutable2017-08-105-119/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improves the `create_templates` transient attribute and use `project.project_feature.update_columns` instead of `project.project_feature.update_attributes!` since it's faster. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Merge branch 'breakpoint-checker-performance' into 'master'Filipa Lacerda2017-08-1012-92/+48
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase performance of the breakpoint size checker See merge request !13454
| | * | | | | | removed global use of breakpoint checkerbreakpoint-checker-performancePhil Hughes2017-08-1011-34/+18
| | | | | | | |
| | * | | | | | Increase performance of the breakpoint size checkerPhil Hughes2017-08-102-61/+33
| | | | | | | |
| * | | | | | | Merge branch 'zj-fix-prom-metrics' into 'master'Stan Hu2017-08-102-5/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong method call on prometheus histogram See merge request !13470
| | * | | | | | | Fix wrong method call on prometheus histogramzj-fix-prom-metricsZ.J. van de Weg2017-08-102-5/+5
| | | | | | | | |
| * | | | | | | | Merge branch 'rs-fix-stubbed-user-factory' into 'master'Rémy Coutable2017-08-101-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually assign `notification_email` in the User factory when stubbed See merge request !13395
| | * | | | | | | | Manually assign `notification_email` in the User factory when stubbedrs-fix-stubbed-user-factoryRobert Speicher2017-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we assign this value in the model via a callback conditionally on `email_changed?`, this never gets set when using `build_stubbed`, resulting in a "can't be blank" validation error on this field. In this case, we can just assign it manually to the same value as `email`, which is generated via a sequence.
| * | | | | | | | | Merge branch '36039-document-new-all-in-one-helm-chart-docs' into 'master'Achilleas Pipinellis2017-08-104-12/+182
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document new all-in-one Helm chart - docs Closes #36039 See merge request !13333
| | * | | | | | | | | Document new all-in-one Helm chart - docsJoshua Lambert2017-08-104-12/+182
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'docs/add-toc' into 'master'Achilleas Pipinellis2017-08-101-0/+4
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Start using 'toc' in yaml frontmatter to explicitly disable it See merge request !13310
| | * | | | | | | | Start using 'toc' in yaml frontmatter to explicitly disable itdocs/add-tocAchilleas Pipinellis2017-08-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/107
| * | | | | | | | | Merge branch '29811-fix-line-number-alignment' into 'master'Annabel Dunstone Gray2017-08-102-1/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix line numbers not matching up to code in code viewer. Closes #29811 See merge request !13403
| | * | | | | | | | | Fix line numbers not matching up to code in code viewer.Trevor Flynn2017-08-102-1/+5
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'remove-affix-issuable-sidebar-new-nav' into 'master'Filipa Lacerda2017-08-102-1/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove affix plugin from issuable sidebar with new navigation See merge request !13449
| | * | | | | | | | | Remove affix plugin from issuable sidebar with new navigationremove-affix-issuable-sidebar-new-navPhil Hughes2017-08-102-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't required with the new navigation as it is always position fixed so we are just creating a scroll event listener that will never actually do anything
| * | | | | | | | | | Merge branch '36158-new-issue-button' into 'master'Phil Hughes2017-08-103-3/+7
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render new issue link in failed job as a regular link instead of a UJS one Closes #36158 See merge request !13450
| | * | | | | | | | | | Render new issue link in failed job as a regular link instead of a UJS one36158-new-issue-buttonFilipa Lacerda2017-08-103-3/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'db-changes-mr-template' into 'master'Rémy Coutable2017-08-101-0/+73
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a template for database changes See merge request !12355
| | * | | | | | | | | | Added a template for database changesYorick Peterse2017-08-101-0/+73
| | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This template includes a rather large (but fairly easy to follow) checklist. This checklist should hopefully take away quite a bit of work from database specialists by requiring authors to provide all the necessary info. [ci skip]
| * | | | | | | | | | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-104-27/+73
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflicting redirect search See merge request !13357
| | * | | | | | | | | Fix stylemk-fix-case-insensitive-redirect-matchingMichael Kozono2017-08-091-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Remove unnecessary work for MySQLMichael Kozono2017-08-081-1/+9
| | | | | | | | | | |
| | * | | | | | | | | Add changelog entryMichael Kozono2017-08-081-0/+4
| | | | | | | | | | |
| | * | | | | | | | | Fix conflicting redirect searchMichael Kozono2017-08-083-27/+61
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '36185-or-separator' into 'master'Phil Hughes2017-08-102-5/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aligns OR separater to center properly Closes #36185 See merge request !13446
| | * | | | | | | | | Fix linter error36185-or-separatorFilipa Lacerda2017-08-101-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Aligns OR separater to center properlyFilipa Lacerda2017-08-102-5/+9
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '35342-re2-in-upgrade-docs' into 'master'Rémy Coutable2017-08-106-0/+53
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include RE2 in the upgrade docs See merge request !13448
| | * | | | | | | | | Include RE2 in the upgrade docsNick Thomas2017-08-106-0/+53
| | | |_|/ / / / / / | | |/| | | | | | |