| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix-kubectl-180' into 'master' | Kamil Trzciński | 2017-10-03 | 2 | -2/+2 |
| |\ | |||||
| | * | Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180 | Alessio Caiazza | 2017-10-03 | 2 | -2/+2 |
| * | | Merge branch '38202-cannot-rename-a-hashed-project' into 'master' | Nick Thomas | 2017-10-03 | 2 | -30/+79 |
| |\ \ | |||||
| | * | | Fix specs for project creation and update services38202-cannot-rename-a-hashed-project | Douglas Barbosa Alexandre | 2017-10-02 | 2 | -3/+3 |
| | * | | Doesn't check if path exists on disk when renaming a hashed project | Douglas Barbosa Alexandre | 2017-10-02 | 2 | -30/+79 |
| * | | | Merge branch 'sh-improve-perf-notes-actions' into 'master' | Douwe Maan | 2017-10-03 | 1 | -0/+34 |
| |\ \ \ | |||||
| | * | | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actions | Stan Hu | 2017-10-02 | 1 | -0/+34 |
| | |/ / | |||||
| * | | | Merge branch 'close-issue-by-implements' into 'master' | Sean McGivern | 2017-10-03 | 1 | -0/+40 |
| |\ \ \ | |||||
| | * | | | Add "implements" to the default issue closing message regex | Guilherme Vieira | 2017-10-02 | 1 | -0/+40 |
| * | | | | Merge branch 'ff_port_from_ee' into 'master' | Sean McGivern | 2017-10-03 | 12 | -71/+322 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee | Valery Sizov | 2017-10-02 | 42 | -220/+966 |
| | |\ \ \ \ | |||||
| | * | | | | | Add merge_requests_rebase_enabled to json entities for specs | Valery Sizov | 2017-10-02 | 2 | -1/+3 |
| | * | | | | | Port semi-linear merge strategy to CE (mostly FE) | Eric Eastwood | 2017-09-29 | 2 | -2/+10 |
| | * | | | | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-28 | 41 | -178/+1327 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-26 | 108 | -1015/+2033 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Add test to check for project settings merge strategies | Eric Eastwood | 2017-09-26 | 1 | -0/+18 |
| | * | | | | | | | Use js- classes instead of Vue refs in tests for some perf | Eric Eastwood | 2017-09-26 | 2 | -11/+23 |
| | * | | | | | | | Use new shared Vue mountComponent method | Eric Eastwood | 2017-09-20 | 1 | -15/+5 |
| | * | | | | | | | Fix entities/merge_request.json by adding ff_only_merge | Valery Sizov | 2017-09-20 | 1 | -1/+2 |
| | * | | | | | | | Add spec for Project#merge_method | Valery Sizov | 2017-09-20 | 1 | -0/+12 |
| | * | | | | | | | Pulling merge_method spec for project_controller_spec from EE[ci skip] | Valery Sizov | 2017-09-20 | 1 | -0/+18 |
| | * | | | | | | | Fix ff_merge_requests.feature spinach tests | Eric Eastwood | 2017-09-20 | 1 | -0/+1 |
| | * | | | | | | | Port fast-forward widget_spec test from EE | Eric Eastwood | 2017-09-19 | 1 | -0/+22 |
| | * | | | | | | | Port fast-forward MR widget states from EE | Eric Eastwood | 2017-09-19 | 2 | -63/+116 |
| | * | | | | | | | Add spec for Repository#ff_merge (ported from EE) | Valery Sizov | 2017-09-19 | 2 | -1/+30 |
| | * | | | | | | | Add spec for FfMergeService | Valery Sizov | 2017-09-19 | 1 | -0/+84 |
| | * | | | | | | | Fast forward merge: basic implemenation[ci skip] | Valery Sizov | 2017-09-19 | 1 | -0/+1 |
| * | | | | | | | | Fix for Gitaly nil encoding issue | Andrew Newdigate | 2017-10-03 | 2 | -1/+15 |
| * | | | | | | | | Merge branch 'gitaly-get-archive' into 'master' | Douwe Maan | 2017-10-03 | 1 | -1/+39 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [ci skip] Fix archive spec descrptionsgitaly-get-archive | Alejandro Rodríguez | 2017-10-02 | 1 | -2/+2 |
| | * | | | | | | | | Send extra Gitaly params for `send_git_archive` if needed | Alejandro Rodríguez | 2017-10-02 | 1 | -1/+39 |
| * | | | | | | | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master' | Douwe Maan | 2017-10-03 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| | * | | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task | Nick Thomas | 2017-10-02 | 1 | -1/+6 |
| | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'sh-fix-import-repos' into 'master' | Robert Speicher | 2017-10-02 | 2 | -0/+20 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix gitlab-rake gitlab:import:repos task | Stan Hu | 2017-10-02 | 2 | -0/+20 |
| | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master' | Robert Speicher | 2017-10-02 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| | * | | | | | | | Create failing test case | robdel12 | 2017-09-30 | 1 | -0/+18 |
| | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | | Merge branch 'fix/gpg/case-insensitive' into 'master' | Dmitriy Zaporozhets | 2017-10-02 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| | * | | | | | | Make GPG validation case insensitive. | Tim Bishop | 2017-09-29 | 1 | -0/+8 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master' | Douwe Maan | 2017-10-02 | 2 | -18/+96 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Refactors SAML identity creation in gl_user. | Tiago Botelho | 2017-10-02 | 2 | -58/+59 |
| | * | | | | | | Attempt to link saml users to ldap by email | Tiago Botelho | 2017-09-25 | 1 | -0/+77 |
| * | | | | | | | Merge branch 'revert-configurable-size-limits' into 'master' | Douwe Maan | 2017-10-02 | 2 | -36/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" | Sean McGivern | 2017-10-02 | 2 | -36/+5 |
| * | | | | | | | | Fix 'gitlay' typo in spec | Jacob Vosmaer | 2017-10-02 | 1 | -1/+1 |
| | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | | Merge branch 'gitaly-add-branch' into 'master' | Sean McGivern | 2017-10-02 | 7 | -53/+181 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branch | Alejandro Rodríguez | 2017-09-30 | 2 | -25/+105 |
| | * | | | | | | Populate `Gitlay::Repository`'s `gl_repository` field | Alejandro Rodríguez | 2017-09-30 | 2 | -1/+45 |
| | * | | | | | | Add a factory for `Gitaly::GitCommit`s | Alejandro Rodríguez | 2017-09-30 | 3 | -27/+31 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge branch '38571-fix-exception-in-raven-report' into 'master' | Sean McGivern | 2017-10-02 | 1 | -0/+21 |
| |\ \ \ \ \ \ | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |