Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly | Ahmad Sherif | 2018-01-11 | 7 | -86/+147 |
| | |||||
* | Merge branch '36906_Reordering_issues_to_the_bottom' into 'master' | Phil Hughes | 2018-01-09 | 3 | -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 Kuri | 2018-01-09 | 3 | -1/+18 |
|/ | | | | list in the board | ||||
* | Merge branch 'move-markdown-preview' into 'master' | Phil Hughes | 2018-01-09 | 3 | -184/+182 |
|\ | | | | | | | | | Remove preview_markdown from the global obj See merge request gitlab-org/gitlab-ce!16025 | ||||
| * | Remove preview_markdown from the global obj | Jacob Schatz | 2018-01-09 | 3 | -184/+182 |
| | | |||||
* | | Merge branch '41404-pipelines-charts' into 'master' | Phil Hughes | 2018-01-09 | 3 | -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-charts | Annabel Dunstone Gray | 2018-01-08 | 3 | -8/+16 |
| | | | |||||
* | | | Merge branch 'check-environment-regex-ce' into 'master' | Grzegorz Bizon | 2018-01-09 | 2 | -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-ce | Shinya Maeda | 2018-01-08 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'check-environment-regex' into 'master' | Grzegorz Bizon | 2018-01-08 | 1 | -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 McGivern | 2018-01-09 | 5 | -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-logs | Stan Hu | 2018-01-08 | 5 | -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 Hughes | 2018-01-09 | 1 | -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 Lacerda | 2018-01-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'improve-table-pagination-spec' into 'master' | Jacob Schatz | 2018-01-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Improve table pagination spec See merge request gitlab-org/gitlab-ce!16099 | ||||
| * | | | Improve table pagination spec | Clement Ho | 2018-01-09 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '41683-timeout-is-not-set-for-gitaly-fetch_remote-calls' into ↵ | Stan Hu | 2018-01-08 | 3 | -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-calls | Alejandro Rodríguez | 2018-01-05 | 3 | -5/+24 |
| | | | | |||||
* | | | | Merge branch 'dispatcher-dashboard-todos' into 'master' | Jacob Schatz | 2018-01-08 | 4 | -7/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor dashboard todos inside dispatcher See merge request gitlab-org/gitlab-ce!16065 | ||||
| * | | | | Refactor dashboard todos inside dispatcher | Clement Ho | 2018-01-08 | 4 | -7/+10 |
|/ / / / | |||||
* | | | | Merge branch 'winh-fix-merge-request-spec' into 'master' | Clement Ho | 2018-01-08 | 1 | -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-spec | Winnie Hellmann | 2018-01-08 | 1 | -4/+11 |
| | | | | | |||||
* | | | | | Merge branch 'osw-merge-request-metrics-population-scheduler-improvement' ↵ | Stan Hu | 2018-01-08 | 1 | -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 scheduler | Oswaldo Ferreira | 2018-01-08 | 1 | -31/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fix/dashboard-projects-nav-links-height' into 'master' | Filipa Lacerda | 2018-01-08 | 2 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix dashboard projects nav links height See merge request gitlab-org/gitlab-ce!16204 | ||||
| * | | | | | Fix dashboard projects nav links height | George Tsiolis | 2018-01-03 | 2 | -1/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'winh-webpack-concatenated-module' into 'master' | Jacob Schatz | 2018-01-08 | 1 | -5/+25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Webpack config for ConcatenatedModule Closes #41649 See merge request gitlab-org/gitlab-ce!16219 | ||||
| * | | | | | | Fix Webpack config for ConcatenatedModulewinh-webpack-concatenated-module | Winnie Hellmann | 2018-01-04 | 1 | -5/+25 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix/remove-unnecessary-dashboard-scroll' into 'master' | Annabel Dunstone Gray | 2018-01-08 | 1 | -4/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary dashboard scroll See merge request gitlab-org/gitlab-ce!16213 | ||||
| * | | | | | | | Remove unnecessary dashboard scroll | George Tsiolis | 2018-01-04 | 1 | -4/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master' | Annabel Dunstone Gray | 2018-01-08 | 4 | -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_indigo | Takuya Noguchi | 2018-01-07 | 4 | -3/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'workhorse-3.4.0' into 'master' | Sean McGivern | 2018-01-08 | 1 | -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.0 | Jacob Vosmaer | 2018-01-08 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2018-01-08 | 1 | -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 questions | Josh Unger | 2018-01-08 | 1 | -3/+7 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch '28260-fix-pages-custom-domain-url' into 'master' | Grzegorz Bizon | 2018-01-08 | 3 | -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 appropriate | Nick Thomas | 2018-01-08 | 3 | -2/+7 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'rs-update-rack-cors' into 'master' | Nick Thomas | 2018-01-08 | 2 | -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.2 | Robert Speicher | 2018-01-02 | 2 | -4/+4 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'docs/typo-writing-documentation' into 'master' | Robert Speicher | 2018-01-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in writing_documentation.md See merge request gitlab-org/gitlab-ce!16276 | ||||
| * | | | | | | | | | | chore: remove symbolic link | Onuwa Nnachi Isaac | 2018-01-08 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix typo in writing_documentation.md | Onuwa Nnachi Isaac | 2018-01-02 | 2 | -2/+3 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch ↵ | Yorick Peterse | 2018-01-08 | 3 | -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-kubernetes | Shinya Maeda | 2018-01-08 | 1 | -4/+10 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix static analysys | Shinya Maeda | 2018-01-08 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Disable STI of ActiveRecord. Refactoring specs. | Shinya Maeda | 2018-01-08 | 2 | -66/+184 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix StaticSnalysys | Shinya Maeda | 2018-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix change log | Shinya Maeda | 2018-01-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Add changelog | Shinya Maeda | 2018-01-08 | 1 | -0/+5 |
| | | | | | | | | | | | |