summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but...Kamil Trzciński2018-01-071-0/+18
|\
| * Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-062-0/+48
| |\
| * \ Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-0526-208/+398
| |\ \
| * \ \ Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2018-01-0552-476/+1331
| |\ \ \
| * \ \ \ Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-...Matija Čupić2017-12-2159-233/+828
| |\ \ \ \
| * | | | | Inluce projects namespace when checking billingMatija Čupić2017-12-161-1/+1
| * | | | | Add Google Cloud client project billing infoMatija Čupić2017-12-161-0/+8
| * | | | | Add Google Cloud client project listMatija Čupić2017-12-151-0/+10
* | | | | | Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'Kamil Trzciński2018-01-073-8/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix/gb/fix-import-export-restoring-associationsGrzegorz Bizon2018-01-0636-310/+791
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Bump import/export version to 2.2.0Grzegorz Bizon2018-01-051-1/+1
| * | | | | | Assign stage and pipeline to a status when importingGrzegorz Bizon2018-01-052-7/+15
* | | | | | | Fix error 500 when viewing commit and merge request diffsStan Hu2018-01-071-1/+1
| |/ / / / / |/| | | | |
* | | | | | Move git operations for multi_action into Gitlab::GitAlejandro Rodríguez2018-01-052-0/+48
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'dm-copy-mermaid-as-gfm' into 'master'Jacob Schatz2018-01-051-10/+1
|\ \ \ \ \
| * | | | | Copy Mermaid graphs as GFMdm-copy-mermaid-as-gfmDouwe Maan2018-01-051-10/+1
* | | | | | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-051-7/+68
* | | | | | API: get participants from merge_requests & issuesBrent Greeff2018-01-052-0/+23
* | | | | | Merge branch 'api-domains-expose-project_id' into 'master'Dmitriy Zaporozhets2018-01-051-0/+1
|\ \ \ \ \ \
| * | | | | | Expose project_id on /api/v4/pages/domainsLuc Didry2018-01-031-0/+1
* | | | | | | Merge branch 'ban-disk-import' into 'master'Sean McGivern2018-01-053-1/+10
|\ \ \ \ \ \ \
| * | | | | | | rubocopban-disk-importJacob Vosmaer2018-01-041-1/+1
| * | | | | | | Hide hooks stuffJacob Vosmaer2018-01-042-3/+2
| * | | | | | | get it workingJacob Vosmaer2018-01-043-1/+11
* | | | | | | | Merge branch 'backport-issue_3413' into 'master'Sean McGivern2018-01-057-60/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | EE-BACKPORT group boardsFelipe Artur2018-01-047-60/+101
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Allow local tests to use a modified GitalyJacob Vosmaer (GitLab)2018-01-052-55/+63
* | | | | | | | Merge branch '40228-verify-integrity-of-repositories' into 'master'Sean McGivern2018-01-053-40/+38
|\ \ \ \ \ \ \ \
| * | | | | | | | refactor spec, add docsJames Lopez2018-01-041-0/+1
| * | | | | | | | deprecate check integrity taskJames Lopez2018-01-041-39/+2
| * | | | | | | | add locks chekJames Lopez2018-01-041-1/+25
| * | | | | | | | remove max-depth flag so it works with subgroupsJames Lopez2018-01-041-1/+1
| * | | | | | | | add new git fsck rake task and specJames Lopez2018-01-041-0/+10
* | | | | | | | | Merge branch 'feature/api_runners_online' into 'master'Rémy Coutable2018-01-051-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add status attribute to runner api entityAlessio Caiazza2018-01-051-0/+1
| * | | | | | | | | Add online attribute to runner api entityAlessio Caiazza2018-01-031-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-blob-batch' into 'master'Douwe Maan2018-01-051-6/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typos in a code commentZeger-Jan van de Weg2018-01-051-2/+2
| * | | | | | | | | Reroute batch blobs to single blob RPCZeger-Jan van de Weg2018-01-021-6/+25
* | | | | | | | | | Merge branch 'fix/prepare-rebase-to-be-migrated-to-gitaly' into 'master'Sean McGivern2018-01-052-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prepare Gitlab::Git::Repository#rebase for Gitaly migrationfix/prepare-rebase-to-be-migrated-to-gitalyAhmad Sherif2018-01-042-1/+13
* | | | | | | | | | | Merge branch 'gitaly-annotations-20180104' into 'master'Sean McGivern2018-01-051-9/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update some Gitaly annotations in Gitlab::Shellgitaly-annotations-20180104Jacob Vosmaer2018-01-041-9/+4
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ldap_username_attributes' into 'master'Douwe Maan2018-01-053-8/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Modify `LDAP::Person` to return username value based on attributesDrew Blessing2018-01-043-8/+32
* | | | | | | | | | | | Fix a bug where charlock_holmes was used needlessly to encode strings41677-branch-name-omitted-due-to-bad-utf-8-conversion-by-gitaly-ref-handlerAlejandro Rodríguez2018-01-042-11/+17
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '41468-error-500-trying-to-view-a-merge-request-json-undefined-m...Douwe Maan2018-01-041-8/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix error when viewing diffs without blobs41468-error-500-trying-to-view-a-merge-request-json-undefined-method-binary-for-nil-nilclassSean McGivern2018-01-041-8/+23
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ce-gitaly-remote-mirror-prep' into 'master'Dmitriy Zaporozhets2018-01-043-42/+105
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move git operations for UpdateRemoteMirrorService into Gitlab::Gitce-gitaly-remote-mirror-prepAlejandro Rodríguez2018-01-031-0/+75
View Lorry Controller Status