Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove leftover API helper for removed CI APIremove-ci-api-leftovers | Robert Schilling | 2017-08-24 | 1 | -14/+0 |
* | Merge branch 'sh-fix-branch-count' into 'master' | Douwe Maan | 2017-08-24 | 2 | -1/+31 |
|\ | |||||
| * | Fix inconsistent number of branches when remote branches are presentsh-fix-branch-count | Stan Hu | 2017-08-23 | 2 | -1/+31 |
* | | Merge branch 'use_full_path_in_project_avatar_url_webhook' into 'master' | Robert Speicher | 2017-08-23 | 2 | -1/+6 |
|\ \ | |||||
| * | | Use full path of project's avatar in webhooks | blackst0ne | 2017-08-18 | 2 | -1/+6 |
* | | | Merge branch 'dm-ldap-adapter-attributes' into 'master' | Robert Speicher | 2017-08-23 | 4 | -8/+19 |
|\ \ \ | |||||
| * | | | Support simple string LDAP attribute specifications, and search for name rath...dm-ldap-adapter-attributes | Douwe Maan | 2017-08-23 | 4 | -8/+19 |
* | | | | Merge branch '36709-gpg-status' into 'master' | Clement Ho | 2017-08-23 | 3 | -6/+7 |
|\ \ \ \ | |||||
| * | | | | Fix alignment of gpg status36709-gpg-status | Annabel Dunstone Gray | 2017-08-23 | 3 | -6/+7 |
* | | | | | Merge branch 'zj-fix-fe-blank-button' into 'master' | Clement Ho | 2017-08-23 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix blank button not resetting project template value | Zeger-Jan van de Weg | 2017-08-23 | 2 | -1/+6 |
* | | | | | | Merge branch '36883-update-license-approval-process' into 'master' | Douwe Maan | 2017-08-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update licensing query guidelines | Nick Thomas | 2017-08-23 | 1 | -1/+1 |
* | | | | | | | Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master' | Robert Speicher | 2017-08-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Properly encode Gitaly RawBlame request paramsfix/gitlay-raw-blame-request-encoding | Ahmad Sherif | 2017-08-23 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'cache-issue-and-mr-counts' into 'master' | Douwe Maan | 2017-08-23 | 25 | -71/+301 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Cache the number of open issues and merge requests | Yorick Peterse | 2017-08-23 | 25 | -71/+301 |
* | | | | | | | Merge branch 'bvl-improve-bare-project-import' into 'master' | Sean McGivern | 2017-08-23 | 8 | -81/+272 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fix error when importing a GitHub-wiki repositorybvl-improve-bare-project-import | Bob Van Landuyt | 2017-08-23 | 1 | -1/+1 |
| * | | | | | | Migrate creation of nested groups into a service | Bob Van Landuyt | 2017-08-23 | 5 | -70/+101 |
| * | | | | | | Improve bare repository import | Bob Van Landuyt | 2017-08-23 | 4 | -63/+223 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Update CHANGELOG.md for 9.5.1 | Simon Knox | 2017-08-23 | 6 | -23/+8 |
* | | | | | | Merge branch '36806-update-rbnacl' into 'master' | Douwe Maan | 2017-08-23 | 2 | -4/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Update the rbnacl gem to 4.0.2 | Nick Thomas | 2017-08-22 | 2 | -4/+4 |
* | | | | | | Merge branch 'gitaly-commit-patch' into 'master' | Sean McGivern | 2017-08-23 | 5 | -4/+45 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patch | Alejandro Rodríguez | 2017-08-22 | 6 | -5/+46 |
* | | | | | | | Merge branch 'remove-tooltip-filtered-search-user' into 'master' | Tim Zallmann | 2017-08-23 | 3 | -9/+46 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove tooltip from filtered search userremove-tooltip-filtered-search-user | Clement Ho | 2017-08-22 | 3 | -9/+46 |
* | | | | | | | | Merge branch 'fix-push-events-branch-removals' into 'master' | Sean McGivern | 2017-08-23 | 7 | -11/+62 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix display of push events for removed refsfix-push-events-branch-removals | Yorick Peterse | 2017-08-22 | 7 | -11/+62 |
* | | | | | | | | | Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into '... | Douwe Maan | 2017-08-23 | 5 | -1/+107 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use EachBatch concern to loop over batchestc-remove-nonexisting-namespace-pending-delete-projects | Toon Claes | 2017-08-22 | 2 | -26/+22 |
| * | | | | | | | | | Migration to remove pending delete projects with non-existing namespace | Toon Claes | 2017-08-22 | 5 | -1/+111 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs-fix-admin-logs-timeout' into 'master' | Douwe Maan | 2017-08-23 | 3 | -16/+17 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Refactor `Admin::LogsController#show`rs-fix-admin-logs-timeout | Robert Speicher | 2017-08-22 | 2 | -10/+15 |
| * | | | | | | | | | Fix a potential timeout in `Gitlab::Logger.read_latest` | Robert Speicher | 2017-08-22 | 1 | -6/+2 |
* | | | | | | | | | | Merge branch 'rs-stub-storage-availability-check' into 'master' | Douwe Maan | 2017-08-23 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Stub `ForkedStorageCheck.storage_available?` by default in all specsrs-stub-storage-availability-check | Robert Speicher | 2017-08-22 | 2 | -1/+13 |
* | | | | | | | | | | | Merge branch 'fix-broken-testing-of-some-integrations' into 'master' | Douwe Maan | 2017-08-23 | 3 | -16/+40 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix inability to test some project integrationsfix-broken-testing-of-some-integrations | Rubén Dávila | 2017-08-22 | 3 | -16/+40 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'disable-webpack-optimization' into 'master' | Tim Zallmann | 2017-08-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimization | Mike Greiling | 2017-08-21 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch '33503-new-icons-for-system-notes' into 'master' | Clement Ho | 2017-08-23 | 16 | -18/+29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Implement new system note icons | Bryce Johnson | 2017-08-23 | 16 | -18/+29 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'fix-group-policy-specs-on-mysql' into 'master' | Robert Speicher | 2017-08-22 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixes group policy specs on MySQL.fix-group-policy-specs-on-mysql | Tiago Botelho | 2017-08-22 | 1 | -0/+6 |
* | | | | | | | | | | | | Merge branch 'rs-fix-master' into 'master' | Stan Hu | 2017-08-22 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add `:nested_groups` metadata to two subgroup-related specs | Robert Speicher | 2017-08-22 | 2 | -2/+2 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '36779-update-kubernetes-install-docs' into 'master' | Marcia Ramos | 2017-08-22 | 4 | -3/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Apply feedback | Joshua Lambert | 2017-08-22 | 1 | -1/+1 |