summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-todo-cops' into 'master'Rémy Coutable2018-10-044-6/+4
|\
| * Fix UriDefaultParser copSemyon Pupkov2018-09-211-1/+1
| * Fix UnneededRequireStatement copSemyon Pupkov2018-09-211-2/+0
| * Fix SpaceInsidePercentLiteralDelimiters copSemyon Pupkov2018-09-201-2/+2
| * Fix SpaceBeforeFirstArg copSemyon Pupkov2018-09-201-1/+1
* | Merge branch '51958-fix-mr-discussion-loading' into 'master'Phil Hughes2018-10-041-0/+4
|\ \
| * | Fix MR discussion not loaded issue51958-fix-mr-discussion-loadingMark Chao2018-10-011-0/+4
* | | Includes commit stats in POST project commits API51803-include-commits-stats-in-projects-apiJacopo2018-10-031-1/+2
* | | Merge branch '45016-add-web-ide-commits-to-usage-ping' into 'master'Douwe Maan2018-10-033-0/+27
|\ \ \
| * | | Implements Web IDE commits counter in RedisTiago Botelho2018-10-033-2/+21
| * | | Adds WebIDE commits to UsagePingTiago Botelho2018-10-012-0/+8
* | | | Merge branch '48004-db-initialize-migrate' into 'master'Dmitriy Zaporozhets2018-10-031-20/+53
|\ \ \ \
| * | | | Process $DB_INITIALIZE and $DB_MIGRATE variablesThong Kuah2018-09-271-20/+53
* | | | | Merge branch 'remove-rugged' into 'master'Douwe Maan2018-10-038-114/+27
|\ \ \ \ \
| * | | | | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-028-114/+27
* | | | | | #13650 added wip search functionality and testsChantal Rollison2018-10-031-1/+1
* | | | | | Merge branch '49952-port-upgrade-command-to-ce' into 'master'Kamil Trzciński2018-10-022-0/+89
|\ \ \ \ \ \
| * | | | | | Port Helm::Api EE extensions to CE49952-port-upgrade-command-to-ceThong Kuah2018-10-011-0/+18
| * | | | | | Port UpgradeCommand to CEThong Kuah2018-09-271-0/+71
* | | | | | | CE Resolve "Refactor code quality similar to JUnit tests"Matija Čupić2018-10-021-1/+2
* | | | | | | Merge branch 'bvl-show-pre-release-sha' into 'master'Sean McGivern2018-10-021-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Show the commit-sha for pre-release versionsBob Van Landuyt2018-10-021-0/+4
* | | | | | | | Merge branch 'osw-configurable-single-diff-file-limit' into 'master'Douwe Maan2018-10-022-32/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Make single diff patch limit configurableosw-configurable-single-diff-file-limitOswaldo Ferreira2018-10-012-32/+32
* | | | | | | | | Use tiller locally for Auto DevopsThong Kuah2018-10-021-9/+18
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Add variables on pipeline webhookPierre Tardy2018-10-011-1/+2
* | | | | | | | Merge remote-tracking branch 'dev/master'Bob Van Landuyt2018-10-013-5/+33
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'security-2697-code-highlight-timeout' into 'master'Bob Van Landuyt2018-10-011-1/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix syntax highlight taking too longMark Chao2018-09-031-1/+13
| * | | | | | | | | [master] Stored XSS in Gitlab Merge Request from imported repositoryFrancisco Javier López2018-10-011-1/+1
| * | | | | | | | | Merge branch 'fix-events-finder-incomplete' into 'master'Bob Van Landuyt2018-10-011-3/+19
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Redact events shown in the events APINick Thomas2018-09-211-3/+19
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge branch 'lib-api-frozen-string-enable' into 'master'Rémy Coutable2018-10-01100-1/+202
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable frozen string in lib/api and lib/backupgfyoung2018-09-29100-1/+202
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch '51021-more-attr-encrypted' into 'master'Rémy Coutable2018-10-013-0/+114
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate sensitive web hook data in the backgroundNick Thomas2018-10-012-0/+108
| * | | | | | | | | | Encrypt webhook tokens and URLs in the databaseNick Thomas2018-10-011-0/+6
* | | | | | | | | | | Merge branch 'feature/set-public-email-through-api' into 'master'Rémy Coutable2018-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | allow users api to set public_emailAlexis Reigel2018-10-011-0/+1
| * | | | | | | | | | remove obsolete parameter from users apiAlexis Reigel2018-09-261-1/+0
* | | | | | | | | | | Merge branch 'sh-fix-issue-52009' into 'master'Sean McGivern2018-10-011-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Prevent Error 500s with invalid relative linksStan Hu2018-09-291-1/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'Nick Thomas2018-10-013-12/+40
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Removes N+1 gitaly rpc call to fetch the last commit for pathTiago Botelho2018-10-013-12/+40
* | | | | | | | | | Merge branch '48399-skip-auto-devops-jobs-based-on-license' into 'master'Dmitriy Zaporozhets2018-10-011-3/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Skip creating auto devops jobs for sast, container_scanning, dast, dependency...48399-skip-auto-devops-jobs-based-on-licenseDylan Griffith2018-09-271-3/+14
* | | | | | | | | | | Merge branch '51651-fill-pipeline-source-for-external-pipelines' into 'master'Kamil Trzciński2018-09-301-0/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Refactor migration specs using ActiveRecord modelsMatija Čupić2018-09-281-1/+1
| * | | | | | | | | | Refactor external_pipelines queryMatija Čupić2018-09-271-8/+5
| * | | | | | | | | | Update all pipelines in single queryMatija Čupić2018-09-271-3/+2