summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed d3.js from the users and graphs bundle39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundlesJose Ivan Vargas2017-10-115-7/+19
|
* Merge branch 'ph-gl-form-js-modules' into 'master'Filipa Lacerda2017-10-1110-232/+214
|\ | | | | | | | | Moves form related JS modules out of global See merge request gitlab-org/gitlab-ce!14780
| * spec fixesph-gl-form-js-modulesPhil Hughes2017-10-114-24/+15
| |
| * Moves form related JS modules out of globalPhil Hughes2017-10-118-210/+201
| |
* | Merge branch 'backport-ee-change-for-test' into 'master'Rémy Coutable2017-10-112-6/+2
|\ \ | | | | | | | | | | | | Backport EE change for setting up forked project See merge request gitlab-org/gitlab-ce!14817
| * | Backport EE change for setting up forked projectbackport-ee-change-for-testLin Jen-Shin2017-10-112-6/+2
| | |
* | | Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master'Douwe Maan2017-10-117-30/+70
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pass git object dir attributes as relative paths to Gitaly Closes gitaly#629 See merge request gitlab-org/gitlab-ce!14713
| * | | Pass git object dir attributes as relative paths to GitalyAhmad Sherif2017-10-117-30/+70
| | | | | | | | | | | | | | | | Fixes gitaly#629
* | | | Merge branch 'winh-i18n-inclusive-language-docs' into 'master'Achilleas Pipinellis2017-10-111-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add inclusive language to translation guidelines See merge request gitlab-org/gitlab-ce!14815
| * | | | Add inclusive language to translation guidelineswinh-i18n-inclusive-languageWinnie Hellmann2017-10-111-0/+12
| | |/ / | |/| |
* | | | Merge branch 'docs-patch-28' into 'master'Achilleas Pipinellis2017-10-111-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Update image commenting MR link in docs See merge request gitlab-org/gitlab-ce!14816
| * | | Update image commenting MR linkClement Ho2017-10-111-1/+2
|/ / /
* | | Merge branch 'rs-mysql-groups-dashboard-failure' into 'master'Douwe Maan2017-10-111-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-failureRobert Speicher2017-10-111-10/+10
| | | |
* | | | Merge branch 'move_markdown_preview_to_concern' into 'master'Sean McGivern2017-10-119-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_concernVitaliy @blackst0ne Klachkov2017-10-119-36/+57
| | | | |
* | | | | Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-116-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-milestonesmicael.bergeron2017-10-062-19/+29
| | | | |
| * | | | adding the new spec filemicael.bergeron2017-10-061-0/+188
| | | | |
| * | | | fix the project import when an issue has a group milestonemicael.bergeron2017-10-053-81/+101
| | | | |
| * | | | fix the spec so it fails before applying the fixmicael.bergeron2017-10-042-4/+16
| | | | |
| * | | | added changelogGitLab Development2017-10-031-0/+5
| | | | |
| * | | | fix the import :milestone from adding the group_idmicael.bergeron2017-10-031-1/+1
| | | | |
* | | | | Merge branch 'gitaly-has-local-branches' into 'master'Rémy Coutable2017-10-114-9/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly's RepositoryService.HasLocalBranches RPC See merge request gitlab-org/gitlab-ce!14753
| * | | | | Use Gitaly's RepositoryService.HasLocalBranches RPCgitaly-has-local-branchesAlejandro Rodríguez2017-10-104-9/+19
| | | | | |
* | | | | | Merge branch '38720-sort-admin-runners' into 'master'Rémy Coutable2017-10-113-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sort runners on admin runners Closes #38720 See merge request gitlab-org/gitlab-ce!14661
| * | | | | | Add sort runners on admin runnersTakuya Noguchi2017-10-043-2/+8
| | | | | | |
* | | | | | | Merge branch ↵Kamil Trzciński2017-10-112-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-underShinya Maeda2017-10-111-1/+0
| | | | | | |
| * | | | | | Add - before google_api/auth/callbackShinya Maeda2017-10-111-3/+5
| | |_|_|_|/ | |/| | | |
* | | | | | 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
|/ / / / / /
View Lorry Controller Status