summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '37970-timestamped-ci' into 'master'Kamil Trzciński2017-10-031-0/+4
|\
| * Expose GitLab features to the CI runner37970-timestamped-ciAlessio Caiazza2017-10-031-0/+4
* | Hide Gollum inside Gitlab::Git::WikiJacob Vosmaer (GitLab)2017-10-032-41/+26
* | Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-10-031-2/+18
|\ \
| * | Doesn't check if path exists on disk when renaming a hashed projectDouglas Barbosa Alexandre2017-10-021-2/+18
* | | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-033-0/+55
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-023-12/+10
| |\ \ \
| * | | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-0/+8
| * | | | [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? methodValery Sizov2017-09-291-1/+1
| * | | | [Port semi-linear history from EE] Move migration to CE and `merge_method` me...Valery Sizov2017-09-291-1/+13
| * | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-286-25/+55
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-2611-48/+48
| |\ \ \ \ \
| * | | | | | Add spec for FfMergeServiceValery Sizov2017-09-191-1/+0
| * | | | | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-192-0/+36
* | | | | | | Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-021-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove lock reason and add guard clauseBrian Neel2017-09-291-1/+1
| * | | | | | Merge conflict resolutionBrian Neel2017-09-271-6/+6
| * | | | | | # This is a combination of 1 commit.Brian Neel2017-09-271-0/+6
* | | | | | | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-021-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-021-2/+4
* | | | | | | | Merge branch 'fix/gpg/case-insensitive' into 'master'Dmitriy Zaporozhets2017-10-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Make GPG validation case insensitive.Tim Bishop2017-09-291-1/+1
* | | | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-021-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-021-1/+5
* | | | | | | | Fix pushes to an empty repository not invalidating has_visible_content? cacheStan Hu2017-10-011-3/+6
| |/ / / / / / |/| | | | | |
* | | | | | | Create repositories via GitalyJacob Vosmaer2017-09-292-2/+2
* | | | | | | Make Repository#has_visible_content more efficientJacob Vosmaer (GitLab)2017-09-291-7/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'hashed-storage-migration-path' into 'master'Douwe Maan2017-09-282-2/+40
|\ \ \ \ \ \
| * | | | | | Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-pathGabriel Mazetto2017-09-282-2/+40
* | | | | | | Support custom attributes on usersMarkus Koller2017-09-282-0/+8
|/ / / / / /
* | | | | | Merge branch 'zj-repo-gitaly' into 'master'Sean McGivern2017-09-281-17/+1
|\ \ \ \ \ \
| * | | | | | RepositoryExists is always called with #gitaly_migrationZeger-Jan van de Weg2017-09-261-17/+1
| | |_|_|/ / | |/| | | |
* | | | | | refactor emails servicerefactor-servicesJames Lopez2017-09-281-2/+2
* | | | | | refactor users update serviceJames Lopez2017-09-281-3/+3
* | | | | | refactor services to match EE signatureJames Lopez2017-09-281-5/+5
| |_|/ / / |/| | | |
* | | | | Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master'Kamil Trzciński2017-09-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move related pipeline class to new pipeline moduleGrzegorz Bizon2017-09-251-1/+1
* | | | | Merge branch 'avatar_n_plus_one' into 'master'Rémy Coutable2017-09-261-2/+5
|\ \ \ \ \
| * | | | | Allow n+1s caused by avatar fetches on the project dashboard. See https://git...avatar_n_plus_oneAndrew Newdigate2017-09-251-2/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'Robert Speicher2017-09-261-6/+5
|\ \ \ \ \
| * | | | | Remove unnecessary commentsDouwe Maan2017-09-251-2/+0
| * | | | | Properly compare diff refs and diff positions when shas are truncatedDouwe Maan2017-09-251-5/+6
| |/ / / /
* | | | | Fix locked shared runners problemTomasz Maczukin2017-09-251-1/+1
| |/ / / |/| | |
* | | | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-233-19/+23
|/ / /
* | | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replaceLin Jen-Shin2017-09-221-0/+1
| |/ |/|
* | Merge branch 'events-redundant-where' into 'master'Rémy Coutable2017-09-212-7/+7
|\ \
| * | Remove redundant WHERE from event queriesevents-redundant-whereYorick Peterse2017-09-202-7/+7
* | | Merge branch 'remove-use-key-worker' into 'master'Rémy Coutable2017-09-211-6/+1
|\ \ \
| * | | Stop using Sidekiq for updating Key#last_used_atremove-use-key-workerYorick Peterse2017-09-201-6/+1
| |/ /
* | | Merge branch 'fix-counts-caching' into 'master'Douwe Maan2017-09-202-4/+0
|\ \ \ | |/ / |/| |