summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-117-86/+147
|
* Merge branch '36906_Reordering_issues_to_the_bottom' into 'master'Phil Hughes2018-01-093-1/+18
|\ | | | | | | | | | | | | Fixing re-ordering of an issue when dragging it to the bottom a long issue list in the board Closes #36906 See merge request gitlab-org/gitlab-ce!16250
| * Fixing re-ordering of an issue when dragging it to the bottom a long issue ↵David Kuri2018-01-093-1/+18
|/ | | | list in the board
* Merge branch 'move-markdown-preview' into 'master'Phil Hughes2018-01-093-184/+182
|\ | | | | | | | | Remove preview_markdown from the global obj See merge request gitlab-org/gitlab-ce!16025
| * Remove preview_markdown from the global objJacob Schatz2018-01-093-184/+182
| |
* | Merge branch '41404-pipelines-charts' into 'master'Phil Hughes2018-01-093-8/+16
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Pipeline graph uses inconsistent colors for its legend and its content" Closes #41404 See merge request gitlab-org/gitlab-ce!16260
| * | Change pipeline charts colors to match legend41404-pipelines-chartsAnnabel Dunstone Gray2018-01-083-8/+16
| | |
* | | Merge branch 'check-environment-regex-ce' into 'master'Grzegorz Bizon2018-01-092-2/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Backport "Fix environment scope regex" to CE Closes gitlab-ee#4308 See merge request gitlab-org/gitlab-ce!15945
| * | Add speccheck-environment-regex-ceShinya Maeda2018-01-081-1/+2
| | |
| * | Merge branch 'check-environment-regex' into 'master'Grzegorz Bizon2018-01-081-1/+1
| | | | | | | | | | | | | | | | | | Fix environment scope regex See merge request gitlab-org/gitlab-ee!3641
* | | Merge branch 'sh-store-user-in-api-logs' into 'master'Sean McGivern2018-01-095-1/+38
|\ \ \ | | | | | | | | | | | | | | | | Save user ID and username in Grape API log (api_json.log) See merge request gitlab-org/gitlab-ce!16264
| * | | Save user ID and username in Grape API log (api_json.log)sh-store-user-in-api-logsStan Hu2018-01-085-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | This will enable admins to identify who actually made the API request. Relates to #36960
* | | | Merge branch '41723-axios-mock-adapter' into 'master'Phil Hughes2018-01-091-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Resolve "Install dev dependencies as devDependencies instead of dependencies" See merge request gitlab-org/gitlab-ce!16288
| * | | Resolve "Install dev dependencies as devDependencies instead of dependencies"Filipa Lacerda2018-01-091-1/+1
|/ / /
* | | Merge branch 'improve-table-pagination-spec' into 'master'Jacob Schatz2018-01-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Improve table pagination spec See merge request gitlab-org/gitlab-ce!16099
| * | | Improve table pagination specClement Ho2018-01-091-1/+1
|/ / /
* | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into ↵Stan Hu2018-01-083-5/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Timeout is not set for gitaly fetch_remote calls" Closes #41683 See merge request gitlab-org/gitlab-ce!16245
| * | | Pass timeout to RepositoryService.FetchRemote Gitaly RPC calls41683-timeout-is-not-set-for-gitaly-fetch_remote-callsAlejandro Rodríguez2018-01-053-5/+24
| | | |
* | | | Merge branch 'dispatcher-dashboard-todos' into 'master'Jacob Schatz2018-01-084-7/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor dashboard todos inside dispatcher See merge request gitlab-org/gitlab-ce!16065
| * | | | Refactor dashboard todos inside dispatcherClement Ho2018-01-084-7/+10
|/ / / /
* | | | Merge branch 'winh-fix-merge-request-spec' into 'master'Clement Ho2018-01-081-4/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make tasklist:changed test in merge_request_spec.js async Closes #34649 See merge request gitlab-org/gitlab-ce!16097
| * | | | Make tasklist:changed test in merge_request_spec.js asyncwinh-fix-merge-request-specWinnie Hellmann2018-01-081-4/+11
| | | | |
* | | | | Merge branch 'osw-merge-request-metrics-population-scheduler-improvement' ↵Stan Hu2018-01-081-31/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove unnecessary queries on Merge Request Metrics population scheduler Closes gitlab-org/release/tasks#13 See merge request gitlab-org/gitlab-ce!16292
| * | | | | Remove unnecessary queries on Merge Request Metrics population schedulerOswaldo Ferreira2018-01-081-31/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix/dashboard-projects-nav-links-height' into 'master'Filipa Lacerda2018-01-082-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix dashboard projects nav links height See merge request gitlab-org/gitlab-ce!16204
| * | | | | Fix dashboard projects nav links heightGeorge Tsiolis2018-01-032-1/+6
| | | | | |
* | | | | | Merge branch 'winh-webpack-concatenated-module' into 'master'Jacob Schatz2018-01-081-5/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Webpack config for ConcatenatedModule Closes #41649 See merge request gitlab-org/gitlab-ce!16219
| * | | | | | Fix Webpack config for ConcatenatedModulewinh-webpack-concatenated-moduleWinnie Hellmann2018-01-041-5/+25
| | | | | | |
* | | | | | | Merge branch 'fix/remove-unnecessary-dashboard-scroll' into 'master'Annabel Dunstone Gray2018-01-081-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary dashboard scroll See merge request gitlab-org/gitlab-ce!16213
| * | | | | | | Remove unnecessary dashboard scrollGeorge Tsiolis2018-01-041-4/+0
| | | | | | | |
* | | | | | | | Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master'Annabel Dunstone Gray2018-01-084-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Substitute ui_charcoal theme deprecated by GitLab Theme (10.0) with ui_indigo Closes #41744 See merge request gitlab-org/gitlab-ce!16271
| * | | | | | | | Substitute deprecated ui_charcoal with new default ui_indigoTakuya Noguchi2018-01-074-3/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'workhorse-3.4.0' into 'master'Sean McGivern2018-01-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 3.4.0 Closes gitaly#886 See merge request gitlab-org/gitlab-ce!16285
| * | | | | | | | | Use workhorse 3.4.0workhorse-3.4.0Jacob Vosmaer2018-01-081-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2018-01-081-3/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitter room link to I want to contribute since you always have questions See merge request gitlab-org/gitlab-ce!16173
| * | | | | | | | | | Add Gitter room link to I want to contribute since you always have questionsJosh Unger2018-01-081-3/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '28260-fix-pages-custom-domain-url' into 'master'Grzegorz Bizon2018-01-083-2/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix wrong output protocol pattern when adding custom domain to Pages" Closes #28260 See merge request gitlab-org/gitlab-ce!16279
| * | | | | | | | | | Generate HTTP URLs for custom Pages domains when appropriateNick Thomas2018-01-083-2/+7
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs-update-rack-cors' into 'master'Nick Thomas2018-01-082-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rack-cors from 0.4.0 to 1.0.2 Closes #41199 See merge request gitlab-org/gitlab-ce!16183
| * | | | | | | | | | Update rack-cors from 0.4.0 to 1.0.2Robert Speicher2018-01-022-4/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs/typo-writing-documentation' into 'master'Robert Speicher2018-01-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in writing_documentation.md See merge request gitlab-org/gitlab-ce!16276
| * | | | | | | | | | chore: remove symbolic linkOnuwa Nnachi Isaac2018-01-081-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Fix typo in writing_documentation.mdOnuwa Nnachi Isaac2018-01-022-2/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Yorick Peterse2018-01-083-0/+468
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetes' into 'master' Migrate existing data from KubernetesService to Clusters::Platforms::Kubernetes Closes #40418 See merge request gitlab-org/gitlab-ce!15589
| * | | | | | | | | | | Add memoization for properties40418-migrate-existing-data-from-kubernetesservice-to-clusters-platforms-kubernetesShinya Maeda2018-01-081-4/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Fix static analysysShinya Maeda2018-01-081-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Disable STI of ActiveRecord. Refactoring specs.Shinya Maeda2018-01-082-66/+184
| | | | | | | | | | | |
| * | | | | | | | | | | Fix StaticSnalysysShinya Maeda2018-01-081-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix change logShinya Maeda2018-01-081-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add changelogShinya Maeda2018-01-081-0/+5
| | | | | | | | | | | |