Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update .nvmrc to 7.5 | Luke "Jared" Bennett | 2017-06-22 | 1 | -1/+1 |
| | |||||
* | added .nvmrc | Luke "Jared" Bennett | 2017-06-22 | 1 | -0/+1 |
| | |||||
* | Merge branch 'gitaly-0.13.0' into 'master' | Sean McGivern | 2017-06-22 | 1 | -1/+1 |
|\ | | | | | | | | | Use Gitaly 0.13.0 See merge request !12377 | ||||
| * | Use Gitaly 0.13.0 | Jacob Vosmaer | 2017-06-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch '33904-edit-issue-warning' into 'master' | Phil Hughes | 2017-06-22 | 2 | -10/+6 |
|\ \ | |/ |/| | | | | | | | | | don't show "Someone edited the issue" warning when saving issue Closes #33904 See merge request !12371 | ||||
| * | don't show "Someone edited the issue" warning when saving issue33904-edit-issue-warning | Simon Knox | 2017-06-22 | 2 | -10/+6 |
| | | | | | | | | don't need to check for form visible because error message isn't rendered otherwise | ||||
* | | Merge branch 'patch-17' into 'master' | Marin Jankovski | 2017-06-22 | 1 | -20/+26 |
|\ \ | | | | | | | | | | | | | clarify NFS option details See merge request !12257 | ||||
| * | | clarify NFS option details | Ben Bodenmiller | 2017-06-19 | 1 | -20/+26 |
| | | | |||||
* | | | Merge branch '25102-files-view-button' into 'master' | Phil Hughes | 2017-06-22 | 6 | -108/+166 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | File view buttons Closes #25102 See merge request !12111 | ||||
| * | | | File view buttons | Annabel Dunstone Gray | 2017-06-22 | 6 | -108/+166 |
|/ / / | |||||
* | | | Merge branch '33853-environments-buttons' into 'master' | Phil Hughes | 2017-06-22 | 1 | -2/+13 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Only show gray footer space if environment actions exist Closes #33853 See merge request !12315 | ||||
| * | | | Only show gray footer space if environment actions exist33853-environments-buttons | Annabel Dunstone Gray | 2017-06-21 | 1 | -2/+13 |
| | | | | |||||
* | | | | Merge branch '32301-filter-archive-project-on-param-present' into 'master' | Rémy Coutable | 2017-06-22 | 4 | -2/+39 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter archived project in API only if param present Closes #32301 See merge request !12245 | ||||
| * | | | | Filter archived project in API v3 only if param present | vanadium23 | 2017-06-21 | 4 | -2/+39 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'dev/master' | Stan Hu | 2017-06-21 | 0 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Update CHANGELOG.md for 9.2.7 | Timothy Andrew | 2017-06-21 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | | Merge branch 'dm-restore-capybara-screenshot' into 'master' | Robert Speicher | 2017-06-22 | 1 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reset the session when the example failed to fix capybara-screenshot See merge request !12370 | ||||
| * | | | | | | Don't reset the session when the example failed, because we need ↵dm-restore-capybara-screenshot | Douwe Maan | 2017-06-21 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | capybara-screenshot to have access to it | ||||
* | | | | | | | Merge branch '33833-issue-and-mr-state-tabs-don-t-work-on-dashboard' into ↵ | Jacob Schatz | 2017-06-22 | 5 | -34/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Issue and MR state tabs don't work on dashboard" Closes #33833 See merge request !12278 | ||||
| * | | | | | | | Add feature spec for dashboard state filter tabs33833-issue-and-mr-state-tabs-don-t-work-on-dashboard | Eric Eastwood | 2017-06-21 | 2 | -1/+6 |
| | | | | | | | | |||||
| * | | | | | | | Revert to using links instead of buttons in Issuable Index tabs. | Bryce Johnson | 2017-06-21 | 4 | -34/+16 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch ↵ | Annabel Dunstone Gray | 2017-06-22 | 5 | -40/+75 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33917-mr-comment-system-note-highlight-don-t-have-the-same-width' into 'master' Resolve "MR comment + system note highlight don't have the same width" Closes #33917 See merge request !12364 | ||||
| * | | | | | | Resolve "MR comment + system note highlight don't have the same width" | Mike Greiling | 2017-06-22 | 5 | -40/+75 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'feature/migrate-blob-find-to-gitaly' into 'master' | Robert Speicher | 2017-06-22 | 7 | -6/+80 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Blob.find to Gitaly See merge request !12104 | ||||
| * | | | | | | Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitaly | Ahmad Sherif | 2017-06-21 | 7 | -6/+80 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'system-note-commits-list-gradient-fix' into 'master' | Annabel Dunstone Gray | 2017-06-21 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed commit list system not gradient Closes #33896 See merge request !12306 | ||||
| * | | | | | | | Fixed commit list system not gradientsystem-note-commits-list-gradient-fix | Phil Hughes | 2017-06-20 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33896 | ||||
* | | | | | | | | Wording of Mysql support. | sytses | 2017-06-21 | 1 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'docs/exclude-codeclimate' into 'master' | Rémy Coutable | 2017-06-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not run the codeclimate job on docs-only changes See merge request !12360 | ||||
| * | | | | | | | | Do not run the codeclimate job on docs-only changes | Achilleas Pipinellis | 2017-06-21 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'docs/add-missing-link' into 'master' | Robert Speicher | 2017-06-21 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing link in Redis HA source docs Closes #33374 See merge request !12342 | ||||
| * | | | | | | | | | Add missing link in Redis HA source docsdocs/add-missing-link | Achilleas Pipinellis | 2017-06-21 | 1 | -0/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'feature-checklist' into 'master' | Marcia Ramos | 2017-06-21 | 1 | -6/+18 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new feature checklist and more elaborate documentation requirements Closes #33750 See merge request !12220 | ||||
| * | | | | | | | | | | a new feature checklist and more elaborate documentation requirements | Job van der Voort | 2017-06-21 | 1 | -6/+18 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'backport-filtered-search-lazy-token-transient' into 'master' | Clement Ho | 2017-06-21 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport filtered search lazy token consistent state fix See merge request !12335 | ||||
| * | | | | | | | | | | Backport filtered search lazy token consistent state fix | Eric Eastwood | 2017-06-21 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2142 Didn't actually fix the spec but is worthwhile to get things in a consistent state no matter how fast the test runs. | ||||
* | | | | | | | | | | | Merge branch '33441_supplement_simplified_chinese_translation_of_i18n' into ↵ | Douwe Maan | 2017-06-21 | 3 | -60/+842 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Supplement Simplified Chinese translation of Project Page & Repository Page Closes #33441 See merge request !11994 | ||||
| * | | | | | | | | | | | Change 'Committed by' Translate | 黄涛 | 2017-06-20 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Translation optimization | 黄涛 | 2017-06-20 | 2 | -30/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Modify the identified translations in the discussion. 2. rebase to master | ||||
| | * | | | | | | | | | | | add missing translation fields | 黄涛 | 2017-06-16 | 2 | -20/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Follow up !12052 commits. | ||||
| | * | | | | | | | | | | | translation optimization in synchronous reviews | 黄涛 | 2017-06-15 | 2 | -25/+25 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | translation optimization in synchronous reviews | 黄涛 | 2017-06-14 | 2 | -59/+59 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Rebase to master | 黄涛 | 2017-06-13 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Change the format in changelog | 黄涛 | 2017-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Optimization 'zh_CN' translation | 黄涛 | 2017-06-13 | 3 | -11/+755 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations | ||||
| | | * | | | | | | | | | | | optimize translation based on comments | 黄涛 | 2017-06-12 | 3 | -614/+74 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | add changelog of supplement simplified chinese translation | 黄涛 | 2017-06-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | supplement simplified chinese translation | 黄涛 | 2017-06-08 | 3 | -21/+656 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33441 | ||||
| | * | | | | | | | | | | | | Optimization 'zh_CN' translation | 黄涛 | 2017-06-13 | 3 | -29/+28 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Change the format in changelog | 黄涛 | 2017-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | |