summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-repository-exists' into 'master'32665-make-project-and-features-visibility-settings-less-confusingSean McGivern2017-08-091-1/+1
|\
| * Rename RPC 'Exists' to 'RepositoryExists'Jacob Vosmaer2017-08-091-1/+1
* | Merge branch 'fix-gitlab-pages-cache-config' into 'master'Grzegorz Bizon2017-08-092-2/+8
|\ \
| * | Fix proxy config in Gitlab Pages nginx examplesNick Thomas2017-08-082-2/+8
* | | Merge branch '36003-do-not-include-to-kernel' into 'master'Robert Speicher2017-08-093-13/+3
|\ \ \ | |_|/ |/| |
| * | We shouldn't include utility methods everywhereLin Jen-Shin2017-08-081-0/+2
| * | Just extend main, rather than include to KernelLin Jen-Shin2017-08-082-13/+1
* | | Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-095-7/+8
|\ \ \
| * | | Fix ee_compat_check when EE branch uses a prefixRémy Coutable2017-08-091-2/+3
| * | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-094-5/+5
* | | | Explain why we use select all for project_url_constrainer.rbDmitriy Zaporozhets2017-08-091-0/+2
|/ / /
* | | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0810-14/+16
|\ \ \
| * | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0810-14/+16
* | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-081-1/+1
* | | | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-0811-89/+108
|\ \ \ \ | |_|/ / |/| | |
| * | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-074-22/+55
| * | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-073-28/+39
| * | | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-078-45/+20
* | | | Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-081-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Raise encoding confidence threshold to 50Lin Jen-Shin2017-08-081-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
View Lorry Controller Status