summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | Fix bitbucket wiki import with hashed storage enabledNick Thomas2017-11-201-2/+2
| |/ / / /
* | | | | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-201-3/+3
* | | | | Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-202-1/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-172-1/+16
* | | | | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-202-3/+17
|\ \ \ \ \
| * | | | | Don't move project repository/attachments when using hashed storageBob Van Landuyt2017-11-202-3/+17
| | |_|/ / | |/| | |
* | | | | Clean up schema of the "merge_requests" tableYorick Peterse2017-11-201-1/+1
* | | | | Merge branch 'fix-conflict-highlighting' into 'master'Douwe Maan2017-11-201-0/+4
|\ \ \ \ \
| * | | | | Fix conflict highlightingfix-conflict-highlightingSean McGivern2017-11-171-0/+4
* | | | | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-2053-0/+74
|\ \ \ \ \ \
| * | | | | | Adds Rubocop rule for line break after guard clauseJacopo2017-11-1653-0/+74
* | | | | | | Fix Gitlab::Git::Repository#remote_tags using unexisting variableAlejandro Rodríguez2017-11-201-2/+2
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master'Robert Speicher2017-11-171-0/+9
|\ \ \ \ \ \
| * | | | | | Add computed update docs for update_column_in_batchesSean McGivern2017-11-171-0/+9
* | | | | | | Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-171-1/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove the selects when counting the last pageBob Van Landuyt2017-11-171-1/+3
* | | | | | | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-174-97/+146
|\ \ \ \ \ \ \
| * | | | | | | Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limitsFrancisco Lopez2017-11-172-9/+9
| * | | | | | | Changes after rebaseFrancisco Lopez2017-11-172-23/+6
| * | | | | | | Removing OffenderFrancisco Lopez2017-11-171-1/+0
| * | | | | | | Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-174-30/+31
| * | | | | | | Moving exceptions to UserAuthFindersFrancisco Lopez2017-11-173-33/+36
| * | | | | | | Leaving atom? query to fix testsFrancisco Lopez2017-11-171-1/+1
| * | | | | | | Change the rss url guard clauseFrancisco Lopez2017-11-171-1/+1