summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix a feature spec failing only on MySQLrs-mysql-groups-dashboard-failureRobert Speicher2017-10-111-10/+10
|
* Merge branch '37399-simplify-project-page' into 'master'Phil Hughes2017-10-1118-187/+313
|\ | | | | | | | | | | | | Simplify project page Closes #37399 and #38839 See merge request gitlab-org/gitlab-ce!14669
| * Simplify project pageAnnabel Dunstone Gray2017-10-1118-187/+313
|/
* Merge branch 'milestones-permissions-docs' into 'master'Sean McGivern2017-10-111-1/+2
|\ | | | | | | | | Developer can create/edit/delete milestones See merge request gitlab-org/gitlab-ce!14797
| * Developer can create/edit/delete milestonesVictor Wu2017-10-111-1/+2
|/
* Merge branch 'rc-change-qa-namespace' into 'master'Grzegorz Bizon2017-10-111-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 underscoresRichard Clamp2017-10-101-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 Hughes2017-10-112-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.jsFilipa Lacerda2017-10-112-20/+21
|/ /
* | Merge branch '38869-labels' into 'master'Phil Hughes2017-10-114-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 managerFilipa Lacerda2017-10-104-151/+137
| | |
* | | Merge branch 'docs-image-discussion' into 'master'Achilleas Pipinellis2017-10-116-3/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add image discussion docs Closes #38879 See merge request gitlab-org/gitlab-ce!14743
| * | | Add image discussion docsClement Ho2017-10-116-3/+40
|/ / /
* | | Merge branch 'rc/refactor-testing-docs' into 'master'Achilleas Pipinellis2017-10-1114-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 Coutable2017-10-1114-876/+1027
|/ / / | | | | | | | | | into multiple pages
* | | Merge branch '38828-update-kubernetes-helm-chart-docs' into 'master'Achilleas Pipinellis2017-10-113-14/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Kubernetes Helm chart docs Closes #38828 See merge request gitlab-org/gitlab-ce!14717
| * | | Update Kubernetes Helm chart docsJoshua Lambert2017-10-113-14/+16
|/ / /
* | | Merge branch 'add-resolve-discussion-test' into 'master'Filipa Lacerda2017-10-101-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-testClement Ho2017-10-101-5/+15
| |/ /
* | | Merge branch '36160-select2-dropdown' into 'master'Annabel Dunstone Gray2017-10-102-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 barFilipa Lacerda2017-10-102-0/+6
|/ / /
* | | Merge branch 'fix-dropdown' into 'master'Annabel Dunstone Gray2017-10-102-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-dropdownFilipa Lacerda2017-10-102-2/+3
| |/ /
* | | Merge branch 'lock-discussion-docs' into 'master'Clement Ho2017-10-102-24/+16
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Locked issues / mrs docs Closes #38880 See merge request gitlab-org/gitlab-ce!14770
| * | Locked issues / mrs docsVictor Wu2017-10-102-24/+16
|/ /
* | Merge branch 'fix-resolved-discussion' into 'master'Filipa Lacerda2017-10-104-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 commentsClement Ho2017-10-104-10/+6
|/ /
* | Merge branch 'gitaly-0.45.1' into 'master'Rémy Coutable2017-10-103-4/+4
|\ \ | | | | | | | | | | | | Use Gitaly 0.45.1 and gitaly-proto 0.41.0 See merge request gitlab-org/gitlab-ce!14787
| * | Fix mysterious rubocop failuregitaly-0.45.1Jacob Vosmaer2017-10-101-2/+2
| | |
| * | Run bundleJacob Vosmaer2017-10-101-2/+2
| | |
| * | Use gitaly-proto 0.41.0Jacob Vosmaer2017-10-101-1/+1
| | |
| * | Use Gitaly 0.45.1Jacob Vosmaer2017-10-101-1/+1
| | |
* | | Merge branch 'an/use-branch-exists-over-branch-names-include' into 'master'Rémy Coutable2017-10-109-10/+15
|\ \ \ | | | | | | | | | | | | | | | | Stop using `branch_names.include?` and use `branch_exists?` See merge request gitlab-org/gitlab-ce!14778
| * | | Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-109-10/+15
|/ / /
* | | Merge branch '38869-u2f' into 'master'38968-label-picker-should-be-cleared-upon-selecting-a-labelPhil Hughes2017-10-1010-374/+321
|\ \ \ | | | | | | | | | | | | | | | | Remove u2f from global namespace See merge request gitlab-org/gitlab-ce!14776
| * | | Remove u2f from globalnamespace38869-u2fFilipa Lacerda2017-10-0910-374/+321
| | | |
* | | | Merge branch 'flash-es6-module' into 'master'Filipa Lacerda2017-10-1074-203/+454
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Flash is now a ES6 module See merge request gitlab-org/gitlab-ce!14626
| * | | removed global eslint for remaining filesflash-es6-modulePhil Hughes2017-10-105-8/+0
| | | |
| * | | fixed notes specsPhil Hughes2017-10-103-13/+33
| | | | | | | | | | | | | | | | | | | | changed how the container class is added onto the text element more specs
| * | | karma spec fixesPhil Hughes2017-10-106-18/+13
| | | |
| * | | fixed eslintPhil Hughes2017-10-102-11/+10
| | | |
| * | | flash testsPhil Hughes2017-10-102-11/+282
| | | | | | | | | | | | | | | | added back in documentation comment to flash file
| * | | spec fixesPhil Hughes2017-10-103-8/+13
| | | |
| * | | Flash is now a ES6 modulePhil Hughes2017-10-1067-179/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced the technical debt around our JS flash function by making it a module that is imported rather than relying on the global function. The global function still exists mainly for technical debt with how some requests are being completed, but new JS should import the module directly. Also reduces some tech debt in the file by removing the need for jQuery. Instead Flash is now 100% vanilla JS.
* | | | Merge branch 'fix/skip-gitaly-mock-linting-error' into 'master'Rémy Coutable2017-10-101-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix a liniting error introduced by !14652 See merge request gitlab-org/gitlab-ce!14790
| * | | | Fix a liniting error introduced by !14652Ahmad Sherif2017-10-101-2/+2
|/ / / /
* | | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-1015-18/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443
| * | | | Changed Group Icon URL Back to try option38245-private-avatars-are-not-cdn-compatibleTim Zallmann2017-10-101-5/+1
| | | | |
| * | | | Fix for Lint Error + Upload TestTim Zallmann2017-10-092-2/+1
| | | | |
| * | | | Based on MR simplified the logicTim Zallmann2017-10-093-17/+5
| | | | |
View Lorry Controller Status