Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'backport-ee-2251' into 'master' | Sean McGivern | 2017-08-07 | 3 | -16/+160 |
|\ | |||||
| * | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25... | Nick Thomas | 2017-08-07 | 3 | -16/+160 |
* | | Merge branch 'blob-batch-methods' into 'master' | Douwe Maan | 2017-08-07 | 1 | -0/+71 |
|\ \ | |||||
| * | | Rename 'limit' to 'blob_size_limit' | Jacob Vosmaer | 2017-08-07 | 1 | -5/+5 |
| * | | Add Gitlab::Git::Blob.batch method | Jacob Vosmaer | 2017-08-01 | 1 | -0/+71 |
* | | | Merge branch 'github' into 'master' | Robert Speicher | 2017-08-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Set the new GitHub import as import source | Douglas Barbosa Alexandre | 2017-08-07 | 1 | -1/+1 |
* | | | | Merge branch 'zj-project-templates' into 'master' | Sean McGivern | 2017-08-07 | 1 | -0/+63 |
|\ \ \ \ | |||||
| * | | | | After merge cleanup | Z.J. van de Weg | 2017-08-07 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into zj-project-templates | Filipa Lacerda | 2017-08-07 | 292 | -1021/+2214 |
| |\ \ \ \ | |||||
| * | | | | | Rename GitLabProjectImporterService and misc fixes | Z.J. van de Weg | 2017-08-01 | 1 | -2/+17 |
| * | | | | | Create rake task to create project templates | Z.J. van de Weg | 2017-08-01 | 1 | -2/+2 |
| * | | | | | Allow projects to be started from a template | Z.J. van de Weg | 2017-07-28 | 1 | -0/+48 |
* | | | | | | Merge branch 'group-milestone-references-system-notes' into 'master' | Robert Speicher | 2017-08-07 | 1 | -67/+129 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Support references to group milestones | Sean McGivern | 2017-08-07 | 1 | -67/+129 |
| | |/ / / | |/| | | | |||||
* | | | | | Add sidekiq metrics endpoint and add http server to sidekiq | Paweł Chojnacki | 2017-08-07 | 3 | -1/+205 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'add-star-for-action-scope' into 'master' | Rémy Coutable | 2017-08-07 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into add-star-for-action-scope | Lin Jen-Shin | 2017-08-07 | 118 | -345/+595 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Cleanup tests and add admin_container_image to | Lin Jen-Shin | 2017-08-02 | 1 | -1/+2 |
* | | | | | Use `broken_storage` in the fs_shards_spec. | Bob Van Landuyt | 2017-08-07 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker' | Douwe Maan | 2017-08-07 | 5 | -60/+100 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'mattermost_fixes' into 'master' | Sean McGivern | 2017-08-07 | 1 | -3/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix Mattermost integrationmattermost_fixes | Valery Sizov | 2017-08-04 | 1 | -3/+4 |
| * | | | | | | Merge branch 'gitaly-renames-annotations' into 'master' | Sean McGivern | 2017-08-07 | 2 | -7/+6 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Remove unnecessary 'raw' alias | Jacob Vosmaer | 2017-08-03 | 2 | -2/+1 |
| | * | | | | | Rename 'commits_between' to 'rugged_commits_between' | Jacob Vosmaer | 2017-08-03 | 1 | -5/+5 |
| * | | | | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master' | Tim Zallmann | 2017-08-06 | 1 | -4/+34 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | add tests for proper timezone date grouping within ContributionsCalendar | Mike Greiling | 2017-07-31 | 1 | -4/+34 |
| * | | | | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitaly | Ahmad Sherif | 2017-08-03 | 1 | -46/+56 |
* | | | | | | | | Use ruby's `File.stat` to check storage availability | Bob Van Landuyt | 2017-08-04 | 1 | -3/+12 |
* | | | | | | | | Only track accessibility once | Bob Van Landuyt | 2017-08-04 | 1 | -3/+32 |
* | | | | | | | | Use `keys` instead of `scan_each` | Bob Van Landuyt | 2017-08-04 | 1 | -1/+3 |
* | | | | | | | | Move hostname to Gitlab::Environment | Bob Van Landuyt | 2017-08-04 | 1 | -1/+1 |
* | | | | | | | | Make sure the check works for paths with spaces. | Bob Van Landuyt | 2017-08-04 | 1 | -0/+22 |
* | | | | | | | | Add a Circuitbreaker for storage paths | Bob Van Landuyt | 2017-08-04 | 6 | -2/+418 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master' | Robert Speicher | 2017-08-03 | 1 | -17/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitaly | Ahmad Sherif | 2017-08-02 | 1 | -17/+27 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'merge-request-commits-background-migration' into 'master' | Rémy Coutable | 2017-08-03 | 1 | -0/+188 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migration | Sean McGivern | 2017-08-03 | 1 | -0/+188 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master' | Sean McGivern | 2017-08-03 | 2 | -17/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mails | Lin Jen-Shin | 2017-08-03 | 2 | -17/+8 |
* | | | | | | | Change all `:empty_project` to `:project`rs-empty_project-default | Robert Speicher | 2017-08-02 | 105 | -213/+213 |
* | | | | | | | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master' | Rémy Coutable | 2017-08-02 | 1 | -0/+30 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Uniquify reserved word usernames on OAuth user creation | Robin Bobbitt | 2017-08-02 | 1 | -0/+30 |
* | | | | | | | Merge branch 'rs-empty_project-cleanup' into 'master' | Rémy Coutable | 2017-08-02 | 23 | -56/+56 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanup | Robert Speicher | 2017-08-01 | 23 | -56/+56 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into 'mas... | Douwe Maan | 2017-08-02 | 2 | -15/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Tests for query context variables | Pawel Chojnacki | 2017-07-31 | 1 | -1/+1 |
| * | | | | | | Context handling and tests cleanup + simple test kube_namespace context test | Pawel Chojnacki | 2017-07-31 | 2 | -15/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'blob-limit-test' into 'master' | Sean McGivern | 2017-08-01 | 1 | -2/+8 |
|\ \ \ \ \ \ |