Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update template description wording39028-repo-by-url-fields | Annabel Dunstone Gray | 2017-10-11 | 1 | -3/+3 |
| | |||||
* | Add project fields to import project by url | Annabel Dunstone Gray | 2017-10-11 | 2 | -47/+53 |
| | |||||
* | Merge branch 'winh-i18n-inclusive-language-docs' into 'master' | Achilleas Pipinellis | 2017-10-11 | 1 | -0/+12 |
|\ | | | | | | | | | Add inclusive language to translation guidelines See merge request gitlab-org/gitlab-ce!14815 | ||||
| * | Add inclusive language to translation guidelineswinh-i18n-inclusive-language | Winnie Hellmann | 2017-10-11 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'docs-patch-28' into 'master' | Achilleas Pipinellis | 2017-10-11 | 1 | -1/+2 |
|\ \ | |/ |/| | | | | | Update image commenting MR link in docs See merge request gitlab-org/gitlab-ce!14816 | ||||
| * | Update image commenting MR link | Clement Ho | 2017-10-11 | 1 | -1/+2 |
|/ | |||||
* | Merge branch 'rs-mysql-groups-dashboard-failure' into 'master' | Douwe Maan | 2017-10-11 | 1 | -10/+10 |
|\ | | | | | | | | | | | | | Fix a feature spec failing only on MySQL Closes #39003 See merge request gitlab-org/gitlab-ce!14811 | ||||
| * | Fix a feature spec failing only on MySQLrs-mysql-groups-dashboard-failure | Robert Speicher | 2017-10-11 | 1 | -10/+10 |
| | | |||||
* | | Merge branch 'move_markdown_preview_to_concern' into 'master' | Sean McGivern | 2017-10-11 | 9 | -36/+57 |
|\ \ | | | | | | | | | | | | | | | | | | | Add support for markdown preview to group milestones Closes #30241 See merge request gitlab-org/gitlab-ce!14806 | ||||
| * | | Add support for markdown preview to group milestonesmove_markdown_preview_to_concern | Vitaliy @blackst0ne Klachkov | 2017-10-11 | 9 | -36/+57 |
| | | | |||||
* | | | Merge branch '35580-cannot-import-project-with-milestones' into 'master' | Sean McGivern | 2017-10-11 | 6 | -98/+333 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix the import :milestone from adding the group_id Closes #35580 See merge request gitlab-org/gitlab-ce!14657 | ||||
| * | | | fixing group label import35580-cannot-import-project-with-milestones | micael.bergeron | 2017-10-06 | 2 | -19/+29 |
| | | | | |||||
| * | | | adding the new spec file | micael.bergeron | 2017-10-06 | 1 | -0/+188 |
| | | | | |||||
| * | | | fix the project import when an issue has a group milestone | micael.bergeron | 2017-10-05 | 3 | -81/+101 |
| | | | | |||||
| * | | | fix the spec so it fails before applying the fix | micael.bergeron | 2017-10-04 | 2 | -4/+16 |
| | | | | |||||
| * | | | added changelog | GitLab Development | 2017-10-03 | 1 | -0/+5 |
| | | | | |||||
| * | | | fix the import :milestone from adding the group_id | micael.bergeron | 2017-10-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'gitaly-has-local-branches' into 'master' | Rémy Coutable | 2017-10-11 | 4 | -9/+19 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use Gitaly's RepositoryService.HasLocalBranches RPC See merge request gitlab-org/gitlab-ce!14753 | ||||
| * | | | | Use Gitaly's RepositoryService.HasLocalBranches RPCgitaly-has-local-branches | Alejandro Rodríguez | 2017-10-10 | 4 | -9/+19 |
| | | | | | |||||
* | | | | | Merge branch '38720-sort-admin-runners' into 'master' | Rémy Coutable | 2017-10-11 | 3 | -2/+8 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sort runners on admin runners Closes #38720 See merge request gitlab-org/gitlab-ce!14661 | ||||
| * | | | | | Add sort runners on admin runners | Takuya Noguchi | 2017-10-04 | 3 | -2/+8 |
| | | | | | | |||||
* | | | | | | Merge branch ↵ | Kamil Trzciński | 2017-10-11 | 2 | -4/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-under' into 'master' Move callback route(`google_api/auth/callback`) for Oauth under `-` Closes #38911 See merge request gitlab-org/gitlab-ce!14802 | ||||
| * | | | | | Remove unnecessary TOLLEVEL routes from path_regex.rbfix/sm/move-callback-route-google_api-auth-callback-for-oauth-under | Shinya Maeda | 2017-10-11 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Add - before google_api/auth/callback | Shinya Maeda | 2017-10-11 | 1 | -3/+5 |
| | | | | | | |||||
* | | | | | | Merge branch '37399-simplify-project-page' into 'master' | Phil Hughes | 2017-10-11 | 18 | -187/+313 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify project page Closes #37399 and #38839 See merge request gitlab-org/gitlab-ce!14669 | ||||
| * | | | | | | Simplify project page | Annabel Dunstone Gray | 2017-10-11 | 18 | -187/+313 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'milestones-permissions-docs' into 'master' | Sean McGivern | 2017-10-11 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developer can create/edit/delete milestones See merge request gitlab-org/gitlab-ce!14797 | ||||
| * | | | | | | Developer can create/edit/delete milestones | Victor Wu | 2017-10-11 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'rc-change-qa-namespace' into 'master' | Grzegorz Bizon | 2017-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA group name, use hyphens rather than underscores See merge request gitlab-org/gitlab-ce!14786 | ||||
| * | | | | | | QA group name, use hyphens rather than underscores | Richard Clamp | 2017-10-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In doing some experimental testing of enabling the embedded mattermost we found that the currently generated QA namespace was problematic in that it used underscores when generating group names. This is invalid for a mattermost team name, underscores are illegal there. Here we change to use hyphens as they are legal in team names. | ||||
* | | | | | | | Merge branch '38869-start' into 'master' | Phil Hughes | 2017-10-11 | 2 | -20/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable eslint in star and remove from main.js See merge request gitlab-org/gitlab-ce!14795 | ||||
| * | | | | | | | Enable eslint in star and remove from main.js | Filipa Lacerda | 2017-10-11 | 2 | -20/+21 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '38869-labels' into 'master' | Phil Hughes | 2017-10-11 | 4 | -151/+137 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Use ES6 modules in labels and labels manager See merge request gitlab-org/gitlab-ce!14794 | ||||
| * | | | | | | Use ES6 modules in labels and labels manager | Filipa Lacerda | 2017-10-10 | 4 | -151/+137 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'docs-image-discussion' into 'master' | Achilleas Pipinellis | 2017-10-11 | 6 | -3/+40 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add image discussion docs Closes #38879 See merge request gitlab-org/gitlab-ce!14743 | ||||
| * | | | | | | Add image discussion docs | Clement Ho | 2017-10-11 | 6 | -3/+40 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'rc/refactor-testing-docs' into 'master' | Achilleas Pipinellis | 2017-10-11 | 14 | -876/+1027 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the Development documentation, and divide the Testing documentation into multiple pages See merge request gitlab-org/gitlab-ce!14512 | ||||
| * | | | | | | Refactor the Development documentation, and divide the Testing documentation ↵ | Rémy Coutable | 2017-10-11 | 14 | -876/+1027 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | into multiple pages | ||||
* | | | | | | Merge branch '38828-update-kubernetes-helm-chart-docs' into 'master' | Achilleas Pipinellis | 2017-10-11 | 3 | -14/+16 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Kubernetes Helm chart docs Closes #38828 See merge request gitlab-org/gitlab-ce!14717 | ||||
| * | | | | | | Update Kubernetes Helm chart docs | Joshua Lambert | 2017-10-11 | 3 | -14/+16 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'add-resolve-discussion-test' into 'master' | Filipa Lacerda | 2017-10-10 | 1 | -5/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit test to test resolved discussion toggle content See merge request gitlab-org/gitlab-ce!14796 | ||||
| * | | | | | | Add explicit test to test resolved discussion toggle contentadd-resolve-discussion-test | Clement Ho | 2017-10-10 | 1 | -5/+15 |
| |/ / / / / | |||||
* | | | | | | Merge branch '36160-select2-dropdown' into 'master' | Annabel Dunstone Gray | 2017-10-10 | 2 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decreases z-index of select2 to a lower number than our navigation bar Closes #36160 See merge request gitlab-org/gitlab-ce!14768 | ||||
| * | | | | | | Decreases z-index of select2 to a lower number than our navigation bar | Filipa Lacerda | 2017-10-10 | 2 | -0/+6 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-dropdown' into 'master' | Annabel Dunstone Gray | 2017-10-10 | 2 | -2/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove not selector increasing specificity of rules Closes #38958 See merge request gitlab-org/gitlab-ce!14789 | ||||
| * | | | | | | Remove not selector increasing specificity of rulesfix-dropdown | Filipa Lacerda | 2017-10-10 | 2 | -2/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'lock-discussion-docs' into 'master' | Clement Ho | 2017-10-10 | 2 | -24/+16 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Locked issues / mrs docs Closes #38880 See merge request gitlab-org/gitlab-ce!14770 | ||||
| * | | | | | Locked issues / mrs docs | Victor Wu | 2017-10-10 | 2 | -24/+16 |
|/ / / / / | |||||
* | | | | | Merge branch 'fix-resolved-discussion' into 'master' | Filipa Lacerda | 2017-10-10 | 4 | -10/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unable to expand text diff discussion comments Closes #38940 See merge request gitlab-org/gitlab-ce!14792 | ||||
| * | | | | | Fix unable to expand text diff discussion comments | Clement Ho | 2017-10-10 | 4 | -10/+6 |
|/ / / / / |