summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix hashed storage for attachments bugsJames Lopez2017-11-231-2/+1
* Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-235-41/+47
|\
| * Rename fetch_refs to refmapDouwe Maan2017-11-234-22/+23
| * Clean up repository fetch and mirror methodsDouwe Maan2017-11-235-38/+43
* | Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'Rémy Coutable2017-11-231-2/+2
|\ \
| * | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateServicejej-rename-legacy-protected-branches-api-serviceJames Edwards-Jones2017-11-231-2/+2
* | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-232-4/+18
|\ \ \
| * | | Move identical merged branch check to merged_branch_namesLin Jen-Shin2017-11-232-4/+18
* | | | Merge branch 'reviewing-db-changes' into 'master'Rémy Coutable2017-11-2313-0/+104
|\ \ \ \
| * | | | Added Rubocop config for background migrationsreviewing-db-changesYorick Peterse2017-11-2313-0/+104
* | | | | Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-232-1/+3
|\ \ \ \ \
| * | | | | Use latest_merge_request_diff associationSean McGivern2017-11-232-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-231-1/+2
|\ \ \ \ \
| * | | | | Fix link text from group contextJarka Kadlecova2017-11-231-1/+2
* | | | | | Allow password authentication to be disabled entirelyMarkus Koller2017-11-236-15/+31
| |_|/ / / |/| | | |
* | | | | Merge branch '40463-ee-compatibility-check-job-fails-unexpectedly' into 'master'Sean McGivern2017-11-231-6/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedlyRémy Coutable2017-11-231-4/+4
| * | | | Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable2017-11-221-1/+1
| * | | | Try to always find the merge base using `origin/#{branch}` instead of just `#...Rémy Coutable2017-11-221-1/+1
| | |_|/ | |/| |
* | | | Fix encoding bugs in Gitlab::Git::UserJacob Vosmaer (GitLab)2017-11-232-2/+11
|/ / /
* | | Merge branch '32620-speed-up-unicorn-specs' into 'master'Rémy Coutable2017-11-222-2/+1
|\ \ \
| * | | Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-222-2/+1
* | | | Merge branch 'pawel/disable_prometheus_metrics' into 'master'Stan Hu2017-11-221-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Force disable Prometheus metricsPawel Chojnacki2017-11-221-3/+3
* | | | Merge branch '40354-improve-ee_compat_check' into 'master'Sean McGivern2017-11-221-31/+38
|\ \ \ \ | |_|_|/ |/| | |
| * | | Try to find the merge-base against the canonical masterRémy Coutable2017-11-221-31/+38
* | | | Merge branch '39720-group-milestone-sorting' into 'master'Sean McGivern2017-11-221-0/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Add group milestone to feature spec and minor changesGeorge Andrinopoulos2017-11-071-7/+7
| * | | Add Group Milestone sortingGeorge Andrinopoulos2017-11-071-0/+40
* | | | Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-225-32/+42
|\ \ \ \
| * | | | Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-225-32/+42
* | | | | Add FetchSourceBranch Gitaly callJacob Vosmaer (GitLab)2017-11-224-8/+45
| |_|_|/ |/| | |
* | | | ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`Brett Walker2017-11-211-1/+4
* | | | Merge branch '39977-gitlab-shell-default-timeout' into 'master'Douwe Maan2017-11-211-2/+1
|\ \ \ \
| * | | | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-211-2/+1
| | |_|/ | |/| |
* | | | Use `make install` for Gitaly setups in non-test environmentsAlejandro Rodríguez2017-11-211-3/+8
|/ / /
* | | Merge branch 'sh-optimize-read-only-check' into 'master'Douwe Maan2017-11-211-1/+7
|\ \ \
| * | | Revert "check for `read_only?` first before seeing if request is disallowed"digitalMoksha2017-11-211-1/+1
| * | | check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-checkdigitalMoksha2017-11-211-1/+1
| * | | use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_he...digitalMoksha2017-11-211-1/+1
| * | | Optimize read-only middleware so that it does not consume as much CPUStan Hu2017-11-201-0/+6
* | | | Skip confirmation user apiDaniel Juarez2017-11-211-1/+2
* | | | Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-re...Sean McGivern2017-11-211-2/+2
|\ \ \ \
| * | | | add `#with_metadata` scope to remove a N+1 from the notes' APImicael.bergeron2017-11-211-2/+2
* | | | | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-214-14/+16
* | | | | Fix slow gitaly dev test bundleJacob Vosmaer (GitLab)2017-11-211-3/+1
* | | | | Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
| |/ / / |/| | |
* | | | Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'Nick Thomas2017-11-201-47/+0
|\ \ \ \
| * | | | remove the rake task `gitlab:sidekiq:drop_post_receive`digitalMoksha2017-11-201-47/+0
* | | | | Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-201-2/+2
|\ \ \ \ \