summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove documentation about rules that are now enforced by RuboCoprs-rspec-hook-argument-copRobert Speicher2017-08-101-6/+0
* Enable the RSpec/HookArgument cop and auto-correct offensesRobert Speicher2017-08-1058-86/+85
* 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
|\
| * Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-103-0/+47
| * Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-103-1/+14
* | Merge branch 'filter-nginx-access-logs' into 'master'Robert Speicher2017-08-102-3/+71
|\ \
| * | 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 entriesJacopo2017-07-224-75/+215
* | | Merge branch 'rc/improve-projects-factory' into 'master'Robert Speicher2017-08-106-196/+130
|\ \ \
| * | | Fix and improve spec/controllers/autocomplete_controller_spec.rbrc/improve-projects-factoryRémy Coutable2017-08-101-77/+56
| * | | Improve the Project factory to make `creator` defaults to namespace.ownerRémy Coutable2017-08-105-119/+74
* | | | Merge branch 'breakpoint-checker-performance' into 'master'Filipa Lacerda2017-08-1012-92/+48
|\ \ \ \
| * | | | 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 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 stubbedrs-fix-stubbed-user-factoryRobert Speicher2017-08-081-0/+4
* | | | | | | 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 - 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 itdocs/add-tocAchilleas Pipinellis2017-08-041-0/+4
* | | | | | | 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.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 navigationremove-affix-issuable-sidebar-new-navPhil Hughes2017-08-102-1/+4
* | | | | | | | 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 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 changesYorick Peterse2017-08-101-0/+73
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'mk-fix-case-insensitive-redirect-matching' into 'master'Sean McGivern2017-08-104-27/+73
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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 docsNick Thomas2017-08-106-0/+53
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'remove-unused-redirect_to_external_issue_tracker' into 'master'Rémy Coutable2017-08-101-12/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam2017-08-101-12/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jarv/update-gemfile-lock' into 'master'Rémy Coutable2017-08-101-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Updating Gemfile.lock for rubocop-rspec dependecy.jarv/update-gemfile-lockJohn Jarvis2017-08-091-0/+1
* | | | | | | Merge branch 'gitlab-infrastructure-archive-route-quick-fix' into 'master'Rémy Coutable2017-08-101-0/+3
|\ \ \ \ \ \ \
| * | | | | | | alternative route for download archivehaseeb2017-08-101-0/+3
|/ / / / / / /
* | | | | | | Merge branch 'fixed-sticky-stats-box-commit-view' into 'master'Filipa Lacerda2017-08-106-14/+23
|\ \ \ \ \ \ \
| * | | | | | | Fix the sticky changes bar on commits pagefixed-sticky-stats-box-commit-viewPhil Hughes2017-08-096-14/+23