summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expand the `save_path` used by capybara-screenshotrs-qa-configurable-chrome-binaryRobert Speicher2017-10-031-1/+1
|
* Allow overriding the Chrome binary used via CHROME_BINARY env variableRobert Speicher2017-10-032-1/+15
|
* Merge branch 'fix-kubectl-180' into 'master'Kamil Trzciński2017-10-034-3/+8
|\ | | | | | | | | | | | | Fix broken certificate-authority-data with kubectl >= 1.8.0 Closes #38685 See merge request gitlab-org/gitlab-ce!14635
| * Fix broken certificate-authority-data with kubectl >= 1.8.0fix-kubectl-180Alessio Caiazza2017-10-034-3/+8
| |
* | Merge branch 'update-pages-0.6' into 'master'Kamil Trzciński2017-10-032-1/+6
|\ \ | | | | | | | | | | | | Update GitLab Pages to v0.6.0 See merge request gitlab-org/gitlab-ce!14630
| * | Update GitLab Pages to v0.6.0Nick Thomas2017-10-022-1/+6
| | |
* | | Merge branch '38202-cannot-rename-a-hashed-project' into 'master'Nick Thomas2017-10-034-32/+103
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot rename a hashed project" Closes #38202 See merge request gitlab-org/gitlab-ce!14428
| * | | Fix specs for project creation and update services38202-cannot-rename-a-hashed-projectDouglas Barbosa Alexandre2017-10-022-3/+3
| | | |
| * | | Add CHANGELOGDouglas Barbosa Alexandre2017-10-021-0/+6
| | | |
| * | | Doesn't check if path exists on disk when renaming a hashed projectDouglas Barbosa Alexandre2017-10-023-32/+97
| | | |
* | | | Merge branch 'sh-improve-perf-notes-actions' into 'master'Douwe Maan2017-10-032-1/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve performance of filtering notes in NotesController See merge request gitlab-org/gitlab-ce!14645
| * | | | Improve performance of filtering notes in NotesControllersh-improve-perf-notes-actionsStan Hu2017-10-022-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces the number of queries needed to redact notes to which the user does not have access. Also includes an N+1 query test as a guard against future issues. This is a follow-up from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14327#note_40976854.
* | | | | Merge branch 'close-issue-by-implements' into 'master'Sean McGivern2017-10-034-2/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "implements" to the default issue closing message regex Closes #38424 See merge request gitlab-org/gitlab-ce!14612
| * | | | | Add "implements" to the default issue closing message regexGuilherme Vieira2017-10-024-2/+47
| | | | | |
* | | | | | Merge branch 'ff_port_from_ee' into 'master'Sean McGivern2017-10-0338-95/+679
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Fast-Forward Merge to CE See merge request gitlab-org/gitlab-ce!14272
| * | | | | | Update MR doc to indicate that the linear-history feature is available for ↵ff_port_from_eeValery Sizov2017-10-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CE as well
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_eeValery Sizov2017-10-02215-4786/+7056
| |\ \ \ \ \ \
| * | | | | | | Add merge_requests_rebase_enabled to json entities for specsValery Sizov2017-10-022-1/+3
| | | | | | | |
| * | | | | | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-298-3/+36
| | | | | | | |
| * | | | | | | [Backport Semi-linear history] Update Project#ff_merge_must_be_possible? methodValery Sizov2017-09-291-1/+1
| | | | | | | |
| * | | | | | | Backport documentation for semi-linear historyValery Sizov2017-09-291-0/+12
| | | | | | | |
| * | | | | | | update a changelogValery Sizov2017-09-291-1/+1
| | | | | | | |
| * | | | | | | [Port semi-linear history from EE] Move migration to CE and `merge_method` ↵Valery Sizov2017-09-293-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method
| * | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-28181-897/+3488
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb db/schema.rb
| * | | | | | | | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
| * | | | | | | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-26756-5209/+9284
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add test to check for project settings merge strategiesEric Eastwood2017-09-261-0/+18
| | | | | | | | | |
| * | | | | | | | | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-265-27/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104
| * | | | | | | | | Use new shared Vue mountComponent methodEric Eastwood2017-09-201-15/+5
| | | | | | | | | |
| * | | | | | | | | Fix entities/merge_request.json by adding ff_only_mergeValery Sizov2017-09-201-1/+2
| | | | | | | | | |
| * | | | | | | | | Add spec for Project#merge_methodValery Sizov2017-09-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be deleted from EE side when doing CE->EE merge!
| * | | | | | | | | Pulling merge_method spec for project_controller_spec from EE[ci skip]Valery Sizov2017-09-201-0/+18
| | | | | | | | | |
| * | | | | | | | | Fix ff_merge_requests.feature spinach testsEric Eastwood2017-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This error was thrown before ``` source repository is empty /builds/gitlab-org/gitlab-ce/lib/gitlab/git/repository.rb:838:in `block in fetch_source_branch' ```
| * | | | | | | | | Port fast-foward spinach specs from EEEric Eastwood2017-09-192-0/+89
| | | | | | | | | |
| * | | | | | | | | Port fast-forward widget_spec test from EEEric Eastwood2017-09-191-0/+22
| | | | | | | | | |
| * | | | | | | | | Update fast-forward doc links to point at own docsEric Eastwood2017-09-192-1/+2
| | | | | | | | | |
| * | | | | | | | | Fix MR docs link to fast-forward sectionEric Eastwood2017-09-191-3/+1
| | | | | | | | | |
| * | | | | | | | | Update fast-forward mr widget docs and add imagesEric Eastwood2017-09-193-2/+2
| | | | | | | | | |
| * | | | | | | | | Port fast-forward MR widget states from EEEric Eastwood2017-09-197-83/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076
| * | | | | | | | | Port fast-forward merge request setting from EEEric Eastwood2017-09-193-22/+26
| | | | | | | | | |
| * | | | | | | | | update changelog with ff merge methodValery Sizov2017-09-191-0/+5
| | | | | | | | | |
| * | | | | | | | | Add documentation for MR's fast-forward merge methodValery Sizov2017-09-192-2/+47
| | | | | | | | | |
| * | | | | | | | | Add spec for Repository#ff_merge (ported from EE)Valery Sizov2017-09-192-1/+30
| | | | | | | | | |
| * | | | | | | | | Add spec for FfMergeServiceValery Sizov2017-09-192-1/+84
| | | | | | | | | |
| * | | | | | | | | Fast forward merge: basic implemenation[ci skip]Valery Sizov2017-09-198-0/+94
| | | | | | | | | |
| * | | | | | | | | Backport project.merge_requests_ff_only_enabled field from EEValery Sizov2017-09-192-0/+18
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-for-nil-encoding-issue' into 'master'Sean McGivern2017-10-034-2/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for Gitaly nil encoding issue See merge request gitlab-org/gitlab-ce!14581
| * | | | | | | | | | Fix for Gitaly nil encoding issueAndrew Newdigate2017-10-034-2/+18
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'gitaly-get-archive' into 'master'Douwe Maan2017-10-032-1/+46
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send extra Gitaly params for `send_git_archive` if needed See merge request gitlab-org/gitlab-ce!14605
| * | | | | | | | | | [ci skip] Fix archive spec descrptionsgitaly-get-archiveAlejandro Rodríguez2017-10-021-2/+2
| | | | | | | | | | |
View Lorry Controller Status