| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | Merge branch 'feature/bump-gitaly-proto-version' into 'master' | Robert Speicher | 2017-10-03 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Bump gitaly-proto version to v0.39.0feature/bump-gitaly-proto-version | Ahmad Sherif | 2017-10-02 | 2 | -2/+2 | |
| * | | | | | | | | | | Merge branch 'gitignore-po-timestamp' into 'master' | Rémy Coutable | 2017-10-03 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Git ignore po files ending in time_stampgitignore-po-timestamp | Achilleas Pipinellis | 2017-10-02 | 1 | -0/+1 | |
| * | | | | | | | | | | | Merge branch 'mr-widget-merged-date-tooltip' into 'master' | Filipa Lacerda | 2017-10-03 | 6 | -22/+70 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | fixed specs when merged event was emptymr-widget-merged-date-tooltip | Phil Hughes | 2017-09-29 | 1 | -4/+10 | |
| | * | | | | | | | | | | | Fixes merge request widget date tooltip inconsistencies | Phil Hughes | 2017-09-29 | 6 | -21/+63 | |
| * | | | | | | | | | | | | Merge branch 'dm-copy-parallel-diff' into 'master' | Phil Hughes | 2017-10-03 | 10 | -100/+208 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diff | Douwe Maan | 2017-10-02 | 10 | -100/+208 | |
| * | | | | | | | | | | | | | Merge branch 'fix-kubectl-180' into 'master' | Kamil Trzciński | 2017-10-03 | 4 | -3/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180 | Alessio Caiazza | 2017-10-03 | 4 | -3/+8 | |
| * | | | | | | | | | | | | | | Merge branch 'update-pages-0.6' into 'master' | Kamil Trzciński | 2017-10-03 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Update GitLab Pages to v0.6.0 | Nick Thomas | 2017-10-02 | 2 | -1/+6 | |
| * | | | | | | | | | | | | | | | Merge branch '38202-cannot-rename-a-hashed-project' into 'master' | Nick Thomas | 2017-10-03 | 4 | -32/+103 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Fix specs for project creation and update services38202-cannot-rename-a-hashed-project | Douglas Barbosa Alexandre | 2017-10-02 | 2 | -3/+3 | |
| | * | | | | | | | | | | | | | | | Add CHANGELOG | Douglas Barbosa Alexandre | 2017-10-02 | 1 | -0/+6 | |
| | * | | | | | | | | | | | | | | | Doesn't check if path exists on disk when renaming a hashed project | Douglas Barbosa Alexandre | 2017-10-02 | 3 | -32/+97 | |
| * | | | | | | | | | | | | | | | | Merge branch 'sh-improve-perf-notes-actions' into 'master' | Douwe Maan | 2017-10-03 | 2 | -1/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actions | Stan Hu | 2017-10-02 | 2 | -1/+35 | |
| | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'close-issue-by-implements' into 'master' | Sean McGivern | 2017-10-03 | 4 | -2/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Add "implements" to the default issue closing message regex | Guilherme Vieira | 2017-10-02 | 4 | -2/+47 | |
| | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge branch 'ff_port_from_ee' into 'master' | Sean McGivern | 2017-10-03 | 38 | -95/+679 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Update MR doc to indicate that the linear-history feature is available for CE...ff_port_from_ee | Valery Sizov | 2017-10-02 | 1 | -2/+0 | |
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee | Valery Sizov | 2017-10-02 | 215 | -4786/+7056 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | 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 | 8 | -3/+36 | |
| | * | | | | | | | | | | | | | | | | | [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? method | Valery Sizov | 2017-09-29 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | Backport documentation for semi-linear history | Valery Sizov | 2017-09-29 | 1 | -0/+12 | |
| | * | | | | | | | | | | | | | | | | | update a changelog | 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 | 3 | -1/+31 | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-28 | 181 | -897/+3488 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Add period to multi-sentence rebase locally message | Eric Eastwood | 2017-09-28 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into ff_port_from_ee | Eric Eastwood | 2017-09-26 | 756 | -5209/+9284 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | 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 | 5 | -27/+34 | |
| | * | | | | | | | | | | | | | | | | | | 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-foward spinach specs from EE | Eric Eastwood | 2017-09-19 | 2 | -0/+89 | |
| | * | | | | | | | | | | | | | | | | | | Port fast-forward widget_spec test from EE | Eric Eastwood | 2017-09-19 | 1 | -0/+22 | |
| | * | | | | | | | | | | | | | | | | | | 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 | |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |