summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-162-0/+4
* Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-165-10/+220
* Merge branch 'rs-redis-config-paths' into 'master'Douwe Maan2017-08-164-16/+12
* Merge branch 'issue_31790' into 'master'Douwe Maan2017-08-161-0/+3
* Merge branch 'zj-add-two-more-project-templates' into 'master'Douwe Maan2017-08-162-3/+10
* Merge branch 'malformed-submodule' into 'master'Douwe Maan2017-08-151-0/+2
* Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-151-0/+79
* Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-151-11/+29
* Revert "Merge branch 'split-events-into-push-events' into 'master'"Jose Ivan Vargas2017-08-115-220/+10
* Merge branch '36328-deserializemergerequestdiffsandcommits-fails-due-to-null-...Yorick Peterse2017-08-111-0/+2
* Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-115-10/+220
* Merge branch 'fix-gitlab-pages-cache-config' into 'master'Grzegorz Bizon2017-08-112-2/+8
* Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-102-1/+13
* Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-091-1/+1
* Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-091-1/+1
* Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern2017-08-081-16/+17
|\
| * Fix the /projects/:id/repository/commits endpoint to handle dots in the ref n...rc/fix-commits-apiRémy Coutable2017-08-081-16/+17
* | Merge branch 'winh-scope-haml-linter' into 'master'Grzegorz Bizon2017-08-081-9/+11
|\ \
| * | Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linterwinh2017-08-081-9/+11
* | | Expose noteable_iid in Notesue4452017-08-081-0/+6
* | | Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern2017-08-082-7/+9
|\ \ \ | |_|/ |/| |
| * | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name...Rémy Coutable2017-08-082-7/+9
* | | Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'mas...Rémy Coutable2017-08-081-1/+1
|\ \ \ | |/ / |/| |
| * | Print the setup steps and duration and fix an issue resulting in re-setuping ...35941-fix-testing-issue-following-gitaly-install-fixRémy Coutable2017-08-041-1/+1
| * | Unset the RUBYOPT env variable before installing gitaly-rubyRémy Coutable2017-08-041-1/+1
| * | Revert "Merge branch 'fix-gitaly-install' into 'master'"Rémy Coutable2017-08-041-1/+1
* | | Merge branch 'master' into ideMike Greiling2017-08-0719-239/+530
|\ \ \
| * \ \ Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+1
| |\ \ \
| | * | | Exclude merge_jid on Import/Export attribute configurationOswaldo Ferreira2017-08-071-0/+1
| * | | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-0/+14
| |\ \ \ \
| | * | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-0/+14
| | |/ / /
| * | | | Merge branch 'feature/migrate-repository-size-to-gitaly' into 'master'Robert Speicher2017-08-072-1/+21
| |\ \ \ \
| | * | | | Migrate Gitlab::Git::Repository#size to Gitalyfeature/migrate-repository-size-to-gitalyAhmad Sherif2017-08-072-1/+21
| | |/ / /
| * | | | Merge branch 'perf.policy-runner-reduce-loops' into 'master'Sean McGivern2017-08-071-5/+7
| |\ \ \ \
| | * | | | more eagerly bail when the state is preventedhttp://jneen.net/2017-08-071-4/+3
| | * | | | reduce iterations by keeping a count of remaining enablershttp://jneen.net/2017-08-071-1/+4
| * | | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-072-45/+50
| |\ \ \ \ \
| | * | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-072-45/+50
| * | | | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-60/+76
| |\ \ \ \ \ \
| | * | | | | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-7/+6
| | * | | | | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-60/+77
| * | | | | | | Merge branch 'github' into 'master'Robert Speicher2017-08-074-20/+55
| |\ \ \ \ \ \ \
| | * | | | | | | Change `project.path_with_namespace` to `project.disk_path`Douglas Barbosa Alexandre2017-08-071-1/+1
| | * | | | | | | Allow users to disable SSL verification if not connecting to github.comDouglas Barbosa Alexandre2017-08-071-4/+15
| | * | | | | | | Fix small typo on Github::Import#fetch_releasesDouglas Barbosa Alexandre2017-08-071-1/+1
| | * | | | | | | Import GitHub releasesDouglas Barbosa Alexandre2017-08-071-0/+2
| | * | | | | | | Fix Github::Import cache for user idsDouglas Barbosa Alexandre2017-08-071-1/+1
| | * | | | | | | Extrac common timeout to a constant on Github::ClientDouglas Barbosa Alexandre2017-08-071-2/+4
| | * | | | | | | Fix small typoe on Github::Client#root_endpointDouglas Barbosa Alexandre2017-08-071-1/+1
| | * | | | | | | Expire content cache when repository fetch failsDouglas Barbosa Alexandre2017-08-071-2/+3