| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | Update fast-forward doc links to point at own docs | Eric Eastwood | 2017-09-19 | 2 | -1/+2 | |
| | * | | | | | | | | | | | | | Fix MR docs link to fast-forward section | Eric Eastwood | 2017-09-19 | 1 | -3/+1 | |
| | * | | | | | | | | | | | | | Update fast-forward mr widget docs and add images | Eric Eastwood | 2017-09-19 | 3 | -2/+2 | |
| | * | | | | | | | | | | | | | Port fast-forward MR widget states from EE | Eric Eastwood | 2017-09-19 | 7 | -83/+157 | |
| | * | | | | | | | | | | | | | Port fast-forward merge request setting from EE | Eric Eastwood | 2017-09-19 | 3 | -22/+26 | |
| | * | | | | | | | | | | | | | update changelog with ff merge method | Valery Sizov | 2017-09-19 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | Add documentation for MR's fast-forward merge method | Valery Sizov | 2017-09-19 | 2 | -2/+47 | |
| | * | | | | | | | | | | | | | 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 | 2 | -1/+84 | |
| | * | | | | | | | | | | | | | Fast forward merge: basic implemenation[ci skip] | Valery Sizov | 2017-09-19 | 8 | -0/+94 | |
| | * | | | | | | | | | | | | | Backport project.merge_requests_ff_only_enabled field from EE | Valery Sizov | 2017-09-19 | 2 | -0/+18 | |
| * | | | | | | | | | | | | | | Merge branch 'fix-for-nil-encoding-issue' into 'master' | Sean McGivern | 2017-10-03 | 4 | -2/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Fix for Gitaly nil encoding issue | Andrew Newdigate | 2017-10-03 | 4 | -2/+18 | |
| |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge branch 'gitaly-get-archive' into 'master' | Douwe Maan | 2017-10-03 | 2 | -1/+46 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | [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 | 2 | -1/+46 | |
| * | | | | | | | | | | | | | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master' | Douwe Maan | 2017-10-03 | 3 | -1/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task | Nick Thomas | 2017-10-02 | 3 | -1/+12 | |
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master' | Stan Hu | 2017-10-02 | 2 | -5/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Update CHANGELOG.md for 9.5.6 | Jose Ivan Vargas | 2017-09-29 | 2 | -5/+7 | |
| * | | | | | | | | | | | | | | | | Merge branch 'enhance-logging' into 'master' | Robert Speicher | 2017-10-02 | 5 | -3/+28 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Remove lock reason and add guard clause | Brian Neel | 2017-09-29 | 2 | -2/+4 | |
| | * | | | | | | | | | | | | | | | Standardize capitalization and status | Brian Neel | 2017-09-27 | 2 | -4/+4 | |
| | * | | | | | | | | | | | | | | | Merge conflict resolution | Brian Neel | 2017-09-27 | 1 | -6/+6 | |
| | * | | | | | | | | | | | | | | | # This is a combination of 1 commit. | Brian Neel | 2017-09-27 | 5 | -3/+26 | |
| * | | | | | | | | | | | | | | | | Merge branch 'sh-fix-import-repos' into 'master' | Robert Speicher | 2017-10-02 | 5 | -3/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Fix gitlab-rake gitlab:import:repos task | Stan Hu | 2017-10-02 | 5 | -3/+31 | |
| | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master' | Robert Speicher | 2017-10-02 | 3 | -1/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Add new changelog entry | robdel12 | 2017-09-30 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | | | Add `:email_confirmation` to devise `insensitive_keys` | robdel12 | 2017-09-30 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | Create failing test case | robdel12 | 2017-09-30 | 1 | -0/+18 | |
| | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch 'fix/gpg/case-insensitive' into 'master' | Dmitriy Zaporozhets | 2017-10-02 | 3 | -1/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Make GPG validation case insensitive. | Tim Bishop | 2017-09-29 | 3 | -1/+14 | |
| * | | | | | | | | | | | | | | | | Merge branch 'log-update-ref-errors' into 'master' | Sean McGivern | 2017-10-02 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Log update-ref errors in OperationService | Jacob Vosmaer | 2017-10-02 | 1 | -1/+3 | |
| | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'sh-thread-safe-markdown' into 'master' | Robert Speicher | 2017-10-02 | 2 | -18/+19 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Make Redcarpet Markdown renderer thread-safe | Stan Hu | 2017-10-02 | 2 | -18/+19 | |
| | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master' | Douwe Maan | 2017-10-02 | 9 | -111/+173 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Refactors SAML identity creation in gl_user. | Tiago Botelho | 2017-10-02 | 8 | -161/+122 | |
| | * | | | | | | | | | | | | | | | Creates compound query for LDAP email attributes. | Tiago Botelho | 2017-09-25 | 2 | -7/+15 | |
| | * | | | | | | | | | | | | | | | Attempt to link saml users to ldap by email | Tiago Botelho | 2017-09-25 | 5 | -8/+101 | |
| * | | | | | | | | | | | | | | | | Merge branch 'revert-configurable-size-limits' into 'master' | Douwe Maan | 2017-10-02 | 3 | -73/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" | Sean McGivern | 2017-10-02 | 3 | -73/+14 | |
| * | | | | | | | | | | | | | | | | | Merge branch '38641-repo-editor-callout' into 'master' | Jacob Schatz | 2017-10-02 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Removes auto devops callout from repo editor view | Filipa Lacerda | 2017-10-02 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | Merge branch 'gitaly-0.43.0' into 'master' | Sean McGivern | 2017-10-02 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Use Gitaly 0.43.0 | Jacob Vosmaer | 2017-10-02 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch '38619-fix-comment-delete-confirm-text' into 'master' | Filipa Lacerda | 2017-10-02 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Fix comment deletion confirmation dialog typo | Mark Fletcher | 2017-10-02 | 2 | -1/+6 | |
| | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Merge branch 'fix-gitlay-typo' into 'master' | Douwe Maan | 2017-10-02 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |