Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '52143-use-tiller-directly' into 'master' | Dmitriy Zaporozhets | 2018-10-05 | 1 | -5/+2 |
|\ | |||||
| * | Redirect IO streams to prevent hanging | Thong Kuah | 2018-10-05 | 1 | -1/+1 |
| * | Use tiller directly for Auto DevOps | Thong Kuah | 2018-10-05 | 1 | -5/+2 |
* | | Merge branch 'revert-2f0a0761' into 'master' | Douwe Maan | 2018-10-05 | 1 | -1/+1 |
|\ \ | |||||
| * | | Revert "Merge branch 'feature/git-v2-flag' into 'master'" | James Lopez | 2018-10-05 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'features/unauth-access-ssh-keys' into 'master' | Douwe Maan | 2018-10-05 | 1 | -4/+2 |
|\ \ | |||||
| * | | List public ssh keys by id or username without authentication | Ronald Claveau | 2018-10-03 | 1 | -4/+2 |
* | | | Merge branch 'mao/48221-issues_show_sql_count' into 'master' | Sean McGivern | 2018-10-05 | 2 | -1/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Banzai project ref- share context more aggresively | Mario de la Ossa | 2018-10-04 | 2 | -1/+2 |
* | | | Merge branch 'ce-7287-epic-references' into 'master' | Nick Thomas | 2018-10-04 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Support short reference to group entities from project entitiesce-7287-epic-references | Jarka Košanová | 2018-10-04 | 1 | -0/+6 |
* | | | | Merge branch 'fix-todo-cops' into 'master' | Rémy Coutable | 2018-10-04 | 4 | -6/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix UriDefaultParser cop | Semyon Pupkov | 2018-09-21 | 1 | -1/+1 |
| * | | | Fix UnneededRequireStatement cop | Semyon Pupkov | 2018-09-21 | 1 | -2/+0 |
| * | | | Fix SpaceInsidePercentLiteralDelimiters cop | Semyon Pupkov | 2018-09-20 | 1 | -2/+2 |
| * | | | Fix SpaceBeforeFirstArg cop | Semyon Pupkov | 2018-09-20 | 1 | -1/+1 |
* | | | | Merge branch '51958-fix-mr-discussion-loading' into 'master' | Phil Hughes | 2018-10-04 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Fix MR discussion not loaded issue51958-fix-mr-discussion-loading | Mark Chao | 2018-10-01 | 1 | -0/+4 |
* | | | | | Includes commit stats in POST project commits API51803-include-commits-stats-in-projects-api | Jacopo | 2018-10-03 | 1 | -1/+2 |
* | | | | | Merge branch '45016-add-web-ide-commits-to-usage-ping' into 'master' | Douwe Maan | 2018-10-03 | 3 | -0/+27 |
|\ \ \ \ \ | |||||
| * | | | | | Implements Web IDE commits counter in Redis | Tiago Botelho | 2018-10-03 | 3 | -2/+21 |
| * | | | | | Adds WebIDE commits to UsagePing | Tiago Botelho | 2018-10-01 | 2 | -0/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch '48004-db-initialize-migrate' into 'master' | Dmitriy Zaporozhets | 2018-10-03 | 1 | -20/+53 |
|\ \ \ \ \ | |||||
| * | | | | | Process $DB_INITIALIZE and $DB_MIGRATE variables | Thong Kuah | 2018-09-27 | 1 | -20/+53 |
* | | | | | | Merge branch 'remove-rugged' into 'master' | Douwe Maan | 2018-10-03 | 8 | -114/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove Gitlab::Git::Repository#rugged and Gollum code | Alejandro Rodríguez | 2018-10-02 | 8 | -114/+27 |
* | | | | | | | #13650 added wip search functionality and tests | Chantal Rollison | 2018-10-03 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch '49952-port-upgrade-command-to-ce' into 'master' | Kamil Trzciński | 2018-10-02 | 2 | -0/+89 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Port Helm::Api EE extensions to CE49952-port-upgrade-command-to-ce | Thong Kuah | 2018-10-01 | 1 | -0/+18 |
| * | | | | | | Port UpgradeCommand to CE | Thong Kuah | 2018-09-27 | 1 | -0/+71 |
* | | | | | | | CE Resolve "Refactor code quality similar to JUnit tests" | Matija Čupić | 2018-10-02 | 1 | -1/+2 |
* | | | | | | | Merge branch 'bvl-show-pre-release-sha' into 'master' | Sean McGivern | 2018-10-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Show the commit-sha for pre-release versions | Bob Van Landuyt | 2018-10-02 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'osw-configurable-single-diff-file-limit' into 'master' | Douwe Maan | 2018-10-02 | 2 | -32/+32 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make single diff patch limit configurableosw-configurable-single-diff-file-limit | Oswaldo Ferreira | 2018-10-01 | 2 | -32/+32 |
* | | | | | | | | | Use tiller locally for Auto Devops | Thong Kuah | 2018-10-02 | 1 | -9/+18 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | Add variables on pipeline webhook | Pierre Tardy | 2018-10-01 | 1 | -1/+2 |
* | | | | | | | | Merge remote-tracking branch 'dev/master' | Bob Van Landuyt | 2018-10-01 | 3 | -5/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'security-2697-code-highlight-timeout' into 'master' | Bob Van Landuyt | 2018-10-01 | 1 | -1/+13 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix syntax highlight taking too long | Mark Chao | 2018-09-03 | 1 | -1/+13 |
| * | | | | | | | | | [master] Stored XSS in Gitlab Merge Request from imported repository | Francisco Javier López | 2018-10-01 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'fix-events-finder-incomplete' into 'master' | Bob Van Landuyt | 2018-10-01 | 1 | -3/+19 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Redact events shown in the events API | Nick Thomas | 2018-09-21 | 1 | -3/+19 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'lib-api-frozen-string-enable' into 'master' | Rémy Coutable | 2018-10-01 | 100 | -1/+202 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Enable frozen string in lib/api and lib/backup | gfyoung | 2018-09-29 | 100 | -1/+202 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '51021-more-attr-encrypted' into 'master' | Rémy Coutable | 2018-10-01 | 3 | -0/+114 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Migrate sensitive web hook data in the background | Nick Thomas | 2018-10-01 | 2 | -0/+108 |
| * | | | | | | | | | | Encrypt webhook tokens and URLs in the database | Nick Thomas | 2018-10-01 | 1 | -0/+6 |
* | | | | | | | | | | | Merge branch 'feature/set-public-email-through-api' into 'master' | Rémy Coutable | 2018-10-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | allow users api to set public_email | Alexis Reigel | 2018-10-01 | 1 | -0/+1 |