| Commit message (Expand) | Author | Age | Files | Lines |
* | Move identical merged branch check to merged_branch_names | Lin Jen-Shin | 2017-11-23 | 2 | -4/+18 |
* | Merge branch '32620-speed-up-unicorn-specs' into 'master' | Rémy Coutable | 2017-11-22 | 2 | -2/+1 |
|\ |
|
| * | Speed up Unicorn specs by using a dummy Rack application instead of GitLab | Nick Thomas | 2017-11-22 | 2 | -2/+1 |
* | | Merge branch 'pawel/disable_prometheus_metrics' into 'master' | Stan Hu | 2017-11-22 | 1 | -3/+3 |
|\ \
| |/
|/| |
|
| * | Force disable Prometheus metrics | Pawel Chojnacki | 2017-11-22 | 1 | -3/+3 |
* | | Merge branch '40354-improve-ee_compat_check' into 'master' | Sean McGivern | 2017-11-22 | 1 | -31/+38 |
|\ \ |
|
| * | | Try to find the merge-base against the canonical master | Rémy Coutable | 2017-11-22 | 1 | -31/+38 |
* | | | Merge branch '39720-group-milestone-sorting' into 'master' | Sean McGivern | 2017-11-22 | 1 | -0/+40 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add group milestone to feature spec and minor changes | George Andrinopoulos | 2017-11-07 | 1 | -7/+7 |
| * | | Add Group Milestone sorting | George Andrinopoulos | 2017-11-07 | 1 | -0/+40 |
* | | | Merge branch 'feature_add_mermaid' into 'master' | Phil Hughes | 2017-11-22 | 5 | -32/+42 |
|\ \ \ |
|
| * | | | Add support of Mermaid | Vitaliy @blackst0ne Klachkov | 2017-11-22 | 5 | -32/+42 |
* | | | | Add FetchSourceBranch Gitaly call | Jacob Vosmaer (GitLab) | 2017-11-22 | 4 | -8/+45 |
* | | | | ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` | Brett Walker | 2017-11-21 | 1 | -1/+4 |
* | | | | Merge branch '39977-gitlab-shell-default-timeout' into 'master' | Douwe Maan | 2017-11-21 | 1 | -2/+1 |
|\ \ \ \ |
|
| * | | | | Set the default gitlab-shell timeout to 3 hours | Nick Thomas | 2017-11-21 | 1 | -2/+1 |
| | |_|/
| |/| | |
|
* | | | | Use `make install` for Gitaly setups in non-test environments | Alejandro Rodríguez | 2017-11-21 | 1 | -3/+8 |
|/ / / |
|
* | | | Merge branch 'sh-optimize-read-only-check' into 'master' | Douwe Maan | 2017-11-21 | 1 | -1/+7 |
|\ \ \ |
|
| * | | | Revert "check for `read_only?` first before seeing if request is disallowed" | digitalMoksha | 2017-11-21 | 1 | -1/+1 |
| * | | | check for `read_only?` first before seeing if request is disallowedsh-optimize-read-only-check | digitalMoksha | 2017-11-21 | 1 | -1/+1 |
| * | | | use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_he... | digitalMoksha | 2017-11-21 | 1 | -1/+1 |
| * | | | Optimize read-only middleware so that it does not consume as much CPU | Stan Hu | 2017-11-20 | 1 | -0/+6 |
* | | | | Skip confirmation user api | Daniel Juarez | 2017-11-21 | 1 | -1/+2 |
* | | | | Merge branch '39461-notes-api-for-issues-no-longer-returns-label-additions-re... | Sean McGivern | 2017-11-21 | 1 | -2/+2 |
|\ \ \ \ |
|
| * | | | | add `#with_metadata` scope to remove a N+1 from the notes' API | micael.bergeron | 2017-11-21 | 1 | -2/+2 |
* | | | | | Batchload blobs for diff generation | Zeger-Jan van de Weg | 2017-11-21 | 4 | -14/+16 |
* | | | | | Fix slow gitaly dev test bundle | Jacob Vosmaer (GitLab) | 2017-11-21 | 1 | -3/+1 |
* | | | | | Memoize GitlabShellAdapter for performance and ease of testing | Stan Hu | 2017-11-20 | 1 | -1/+1 |
| |/ / /
|/| | | |
|
* | | | | Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master' | Nick Thomas | 2017-11-20 | 1 | -47/+0 |
|\ \ \ \ |
|
| * | | | | remove the rake task `gitlab:sidekiq:drop_post_receive` | digitalMoksha | 2017-11-20 | 1 | -47/+0 |
* | | | | | Merge branch '40292-bitbucket-import-hashed-storage' into 'master' | Douwe Maan | 2017-11-20 | 1 | -2/+2 |
|\ \ \ \ \ |
|
| * | | | | | Fix bitbucket wiki import with hashed storage enabled | Nick Thomas | 2017-11-20 | 1 | -2/+2 |
| |/ / / / |
|
* | | | | | Clarify wording of protected branch settings for the default branch | Sean McGivern | 2017-11-20 | 1 | -3/+3 |
* | | | | | Merge branch 'gitaly-delete-refs' into 'master' | Douwe Maan | 2017-11-20 | 2 | -1/+16 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refs | Alejandro Rodríguez | 2017-11-17 | 2 | -1/+16 |
* | | | | | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master' | Douwe Maan | 2017-11-20 | 2 | -3/+17 |
|\ \ \ \ \ |
|
| * | | | | | Don't move project repository/attachments when using hashed storage | Bob Van Landuyt | 2017-11-20 | 2 | -3/+17 |
| | |_|/ /
| |/| | | |
|
* | | | | | Clean up schema of the "merge_requests" table | Yorick Peterse | 2017-11-20 | 1 | -1/+1 |
* | | | | | Merge branch 'fix-conflict-highlighting' into 'master' | Douwe Maan | 2017-11-20 | 1 | -0/+4 |
|\ \ \ \ \ |
|
| * | | | | | Fix conflict highlightingfix-conflict-highlighting | Sean McGivern | 2017-11-17 | 1 | -0/+4 |
* | | | | | | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master' | Rémy Coutable | 2017-11-20 | 53 | -0/+74 |
|\ \ \ \ \ \ |
|
| * | | | | | | Adds Rubocop rule for line break after guard clause | Jacopo | 2017-11-16 | 53 | -0/+74 |
* | | | | | | | Fix Gitlab::Git::Repository#remote_tags using unexisting variable | Alejandro Rodríguez | 2017-11-20 | 1 | -2/+2 |
| |_|/ / / /
|/| | | | | |
|
* | | | | | | Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master' | Robert Speicher | 2017-11-17 | 1 | -0/+9 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add computed update docs for update_column_in_batches | Sean McGivern | 2017-11-17 | 1 | -0/+9 |
* | | | | | | | Merge branch 'bvl-fix-count-with-selects' into 'master' | Douwe Maan | 2017-11-17 | 1 | -1/+3 |
|\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | Remove the selects when counting the last page | Bob Van Landuyt | 2017-11-17 | 1 | -1/+3 |
* | | | | | | | Merge branch 'mk-add-user-rate-limits' into 'master' | Douwe Maan | 2017-11-17 | 4 | -97/+146 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limits | Francisco Lopez | 2017-11-17 | 2 | -9/+9 |
| * | | | | | | | Changes after rebase | Francisco Lopez | 2017-11-17 | 2 | -23/+6 |