Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '37970-timestamped-ci' into 'master' | Kamil Trzciński | 2017-10-03 | 1 | -0/+4 |
|\ | |||||
| * | Expose GitLab features to the CI runner37970-timestamped-ci | Alessio Caiazza | 2017-10-03 | 1 | -0/+4 |
* | | Hide Gollum inside Gitlab::Git::Wiki | Jacob Vosmaer (GitLab) | 2017-10-03 | 2 | -41/+26 |
* | | Merge branch '38202-cannot-rename-a-hashed-project' into 'master' | Nick Thomas | 2017-10-03 | 1 | -2/+18 |
|\ \ | |||||
| * | | Doesn't check if path exists on disk when renaming a hashed project | Douglas Barbosa Alexandre | 2017-10-02 | 1 | -2/+18 |
* | | | Merge branch 'ff_port_from_ee' into 'master' | Sean McGivern | 2017-10-03 | 3 | -0/+55 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee | Valery Sizov | 2017-10-02 | 3 | -12/+10 |
| |\ \ \ | |||||
| * | | | | Port semi-linear merge strategy to CE (mostly FE) | Eric Eastwood | 2017-09-29 | 1 | -0/+8 |
| * | | | | [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? method | Valery Sizov | 2017-09-29 | 1 | -1/+1 |
| * | | | | [Port semi-linear history from EE] Move migration to CE and `merge_method` me... | Valery Sizov | 2017-09-29 | 1 | -1/+13 |
| * | | | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-28 | 6 | -25/+55 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-26 | 11 | -48/+48 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add spec for FfMergeService | Valery Sizov | 2017-09-19 | 1 | -1/+0 |
| * | | | | | | Fast forward merge: basic implemenation[ci skip] | Valery Sizov | 2017-09-19 | 2 | -0/+36 |
* | | | | | | | Merge branch 'enhance-logging' into 'master' | Robert Speicher | 2017-10-02 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Remove lock reason and add guard clause | Brian Neel | 2017-09-29 | 1 | -1/+1 |
| * | | | | | | Merge conflict resolution | Brian Neel | 2017-09-27 | 1 | -6/+6 |
| * | | | | | | # This is a combination of 1 commit. | Brian Neel | 2017-09-27 | 1 | -0/+6 |
* | | | | | | | Merge branch 'sh-fix-import-repos' into 'master' | Robert Speicher | 2017-10-02 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix gitlab-rake gitlab:import:repos task | Stan Hu | 2017-10-02 | 1 | -2/+4 |
* | | | | | | | | Merge branch 'fix/gpg/case-insensitive' into 'master' | Dmitriy Zaporozhets | 2017-10-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Make GPG validation case insensitive. | Tim Bishop | 2017-09-29 | 1 | -1/+1 |
* | | | | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master' | Douwe Maan | 2017-10-02 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Refactors SAML identity creation in gl_user. | Tiago Botelho | 2017-10-02 | 1 | -1/+5 |
* | | | | | | | | Fix pushes to an empty repository not invalidating has_visible_content? cache | Stan Hu | 2017-10-01 | 1 | -3/+6 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Create repositories via Gitaly | Jacob Vosmaer | 2017-09-29 | 2 | -2/+2 |
* | | | | | | | Make Repository#has_visible_content more efficient | Jacob Vosmaer (GitLab) | 2017-09-29 | 1 | -7/+2 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch 'hashed-storage-migration-path' into 'master' | Douwe Maan | 2017-09-28 | 2 | -2/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add support to migrate existing projects to Hashed Storage asynchashed-storage-migration-path | Gabriel Mazetto | 2017-09-28 | 2 | -2/+40 |
* | | | | | | | Support custom attributes on users | Markus Koller | 2017-09-28 | 2 | -0/+8 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'zj-repo-gitaly' into 'master' | Sean McGivern | 2017-09-28 | 1 | -17/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | RepositoryExists is always called with #gitaly_migration | Zeger-Jan van de Weg | 2017-09-26 | 1 | -17/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | refactor emails servicerefactor-services | James Lopez | 2017-09-28 | 1 | -2/+2 |
* | | | | | | refactor users update service | James Lopez | 2017-09-28 | 1 | -3/+3 |
* | | | | | | refactor services to match EE signature | James Lopez | 2017-09-28 | 1 | -5/+5 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge branch 'backstage/gb/refactor-pipeline-create-service' into 'master' | Kamil Trzciński | 2017-09-27 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Move related pipeline class to new pipeline module | Grzegorz Bizon | 2017-09-25 | 1 | -1/+1 |
* | | | | | Merge branch 'avatar_n_plus_one' into 'master' | Rémy Coutable | 2017-09-26 | 1 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Allow n+1s caused by avatar fetches on the project dashboard. See https://git...avatar_n_plus_one | Andrew Newdigate | 2017-09-25 | 1 | -2/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'dm-bitbucket-import-truncated-shas' into 'master' | Robert Speicher | 2017-09-26 | 1 | -6/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unnecessary comments | Douwe Maan | 2017-09-25 | 1 | -2/+0 |
| * | | | | | Properly compare diff refs and diff positions when shas are truncated | Douwe Maan | 2017-09-25 | 1 | -5/+6 |
| |/ / / / | |||||
* | | | | | Fix locked shared runners problem | Tomasz Maczukin | 2017-09-25 | 1 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | Improve list of sorting options | Vitaliy @blackst0ne Klachkov | 2017-09-23 | 3 | -19/+23 |
|/ / / | |||||
* | | | Reserve refs/replace cos `git-replace` is using it38234-reserve-refs-replace | Lin Jen-Shin | 2017-09-22 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge branch 'events-redundant-where' into 'master' | Rémy Coutable | 2017-09-21 | 2 | -7/+7 |
|\ \ | |||||
| * | | Remove redundant WHERE from event queriesevents-redundant-where | Yorick Peterse | 2017-09-20 | 2 | -7/+7 |
* | | | Merge branch 'remove-use-key-worker' into 'master' | Rémy Coutable | 2017-09-21 | 1 | -6/+1 |
|\ \ \ | |||||
| * | | | Stop using Sidekiq for updating Key#last_used_atremove-use-key-worker | Yorick Peterse | 2017-09-20 | 1 | -6/+1 |
| |/ / | |||||
* | | | Merge branch 'fix-counts-caching' into 'master' | Douwe Maan | 2017-09-20 | 2 | -4/+0 |
|\ \ \ | |/ / |/| | |