summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Make local_branches OPT_OUTan/local_branches_opt_outAndrew Newdigate2017-10-261-1/+1
* Merge branch 'gitaly-ff-merge-preparation' into 'master'Rémy Coutable2017-10-252-4/+10
|\
| * Move all rugged operation for ff_merge inside Gitlab::Gitgitaly-ff-merge-preparationAlejandro Rodríguez2017-10-242-4/+10
* | Merge branch 'gitaly-gl-username' into 'master'Douwe Maan2017-10-243-17/+10
|\ \
| * | Support `Gitaly::User`'s gl_username fieldgitaly-gl-usernameAlejandro Rodríguez2017-10-233-17/+10
* | | Merge branch 'sh-memoize-logger' into 'master'Nick Thomas2017-10-241-2/+10
|\ \ \
| * | | Memoize GitLab logger to reduce open file descriptorsStan Hu2017-10-241-2/+10
| |/ /
* | | Merge branch '23000-pages-api' into 'master'Grzegorz Bizon2017-10-244-0/+139
|\ \ \
| * | | Add pages domains API implementationTravis Miller2017-10-223-0/+122
| * | | Add pages domains API entitiesTravis Miller2017-10-221-0/+17
* | | | Merge branch 'bvl-circuitbreaker-backoff' into 'master'Sean McGivern2017-10-245-13/+54
|\ \ \ \
| * | | | Allow enabling the circuitbreaker using an env variablebvl-circuitbreaker-backoffBob Van Landuyt2017-10-231-1/+10
| * | | | Perform the stat check multiple times when checking a storageBob Van Landuyt2017-10-232-3/+12
| * | | | Implement backoff for the circuitbreakerBob Van Landuyt2017-10-234-9/+32
* | | | | Merge branch 'performance-bar-sql' into 'master'Rémy Coutable2017-10-241-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove Sherlock usage from the performance barperformance-bar-sqlYorick Peterse2017-10-231-2/+2
* | | | | Merge branch 'zj-peek-gitaly' into 'master'Rémy Coutable2017-10-232-0/+43
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add Gitaly data to the Peek performance barZeger-Jan van de Weg2017-10-232-0/+43
* | | | | Decrease ABC threshold to 54.28Maxim Rydkin2017-10-221-4/+6
| |_|/ / |/| | |
* | | | Merge branch '37391-wiki-disk-path-helper' into 'master'Nick Thomas2017-10-202-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Use wiki.disk_pathNick Thomas2017-10-182-2/+2
* | | | Merge branch '18765-stub_env_in_specs' into 'master'Robert Speicher2017-10-191-39/+39
|\ \ \ \
| * | | | Stub ENV in the backup task spec fileRémy Coutable2017-10-181-39/+39
| | |_|/ | |/| |
* | | | Avoind unnecesary `force_encoding` operationsAlejandro Rodríguez2017-10-181-2/+5
|/ / /
* | | Improve the gitlab:dev:ee_compat_check task to pass a repo URL without creden...39237-fix-ee_compat_checkRémy Coutable2017-10-181-1/+3
|/ /
* | Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'Sean McGivern2017-10-182-8/+72
|\ \
| * | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-162-8/+72
* | | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-181-2/+12
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-1716-53/+283
| |\ \
| * | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-171-2/+12
* | | | Merge branch '37032-get-project-branch-invalid-name-message' into 'master'Rémy Coutable2017-10-181-8/+14
|\ \ \ \
| * | | | Get Project Branch API shows an helpful error message on invalid refnameJacopo2017-10-181-8/+14
* | | | | Merge branch 'tc-saml-fix-false-empty' into 'master'Douwe Maan2017-10-181-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-emptyToon Claes2017-10-181-1/+1
* | | | | Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-172-6/+16
|\ \ \ \ \
| * | | | | Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-172-6/+16
* | | | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-171-0/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-173-18/+36
|\ \ \ \ \
| * | | | | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-173-18/+36
* | | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-175-6/+209
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1081-375/+2113
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Reuse `base_and_ancestors` for `ancestors` in `GroupHierarchy`Bob Van Landuyt2017-10-101-2/+1
| * | | | | | Optimize queries and pagination in `GroupDescendantsFinder`Bob Van Landuyt2017-10-051-0/+61
| * | | | | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-0/+117
| * | | | | | Make it possible to limit ancestors in a `GroupHierarchy`Bob Van Landuyt2017-10-041-4/+27
| * | | | | | Don't break when building unions on empty collectionsBob Van Landuyt2017-10-041-1/+5
| * | | | | | Update `children` route to handle projects and groupsBob Van Landuyt2017-10-041-1/+0
* | | | | | | Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-161-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove boards from the list of reserved top pathsValery Sizov2017-10-131-1/+0
* | | | | | | | Merge branch 'sha-handling' into 'master'Douwe Maan2017-10-166-22/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
View Lorry Controller Status