| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Uniform style between all upload forms40780-choose-file | Filipa Lacerda | 2017-12-22 | 4 | -30/+23 |
| | | |||||
| * | Update Browse file to Choose file in all occurences | Filipa Lacerda | 2017-12-21 | 3 | -2/+7 |
| | | |||||
| * | Merge branch 'fix-webpack-chunk-naming' into 'master' | Jacob Schatz | 2017-12-21 | 3 | -3/+13 |
| |\ | | | | | | | | | Properly name webpack chunks for dynamic imports See merge request gitlab-org/gitlab-ce!16066 | ||||
| | * | Merge branch 'master' into fix-webpack-chunk-naming | Clement Ho | 2017-12-21 | 299 | -2357/+4831 |
| | |\ | |||||
| | * | | update dispatcher to allow for dynamic imports until webpack plugin is updatedfix-webpack-chunk-naming | Mike Greiling | 2017-12-20 | 2 | -1/+6 |
| | | | | |||||
| | * | | properly handle naming for dispatcher route chunks | Mike Greiling | 2017-12-20 | 1 | -2/+7 |
| | | | | |||||
| * | | | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master' | Douwe Maan | 2017-12-21 | 9 | -26/+39 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reduce cardinality of some of GitLab's Prometheus metrics and fix observed duration reporting. Closes #41045 See merge request gitlab-org/gitlab-ce!15881 | ||||
| | * | | | add missing word to pawel-reduce_cardinality_of_prometheus_metrics.ymlpawel/reduce_cardinality_of_prometheus_metrics | Paweł Chojnacki | 2017-12-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Use seconds where possible, and convert to milliseconds for Influxdb consumption | Pawel Chojnacki | 2017-12-21 | 5 | -28/+31 |
| | | | | | |||||
| | * | | | use in_milliseconds rails helper | Pawel Chojnacki | 2017-12-20 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Fix tests and formatting | Pawel Chojnacki | 2017-12-19 | 4 | -7/+8 |
| | | | | | |||||
| | * | | | Make `System.monotonic_time` retun seconds represented by float with ↵ | Pawel Chojnacki | 2017-12-12 | 6 | -17/+26 |
| | | | | | | | | | | | | | | | | | microsecond precision | ||||
| | * | | | Fix gitaly_call_histogram to observe times in seconds correctly | Pawel Chojnacki | 2017-12-12 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Reduce cardinality of gitlab_cache_operation_duration_seconds histogram | Pawel Chojnacki | 2017-12-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'bvl-patch-mr-serializer' into 'master' | Douwe Maan | 2017-12-21 | 3 | -3/+11 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fall back to the `MergeRequestWidgetEntity` Closes #41296 See merge request gitlab-org/gitlab-ce!16074 | ||||
| | * | | | Fall back to the `MergeRequestWidgetEntity` | Bob Van Landuyt | 2017-12-21 | 3 | -3/+11 |
| | | | | | | | | | | | | | | | | | When no serializer was passed. | ||||
| * | | | | Merge branch '40040-decouple-multi-file-editor-from-file-list' into 'master' | Phil Hughes | 2017-12-21 | 136 | -1734/+2867 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Decouple multi-file editor from file list" Closes #40040 and #40032 See merge request gitlab-org/gitlab-ce!15430 | ||||
| | * | | | | Resolve "Decouple multi-file editor from file list" | Tim Zallmann | 2017-12-21 | 136 | -1734/+2867 |
| |/ / / / | |||||
| * | | | | Merge branch 'organise-by-subject' into 'master' | Marcia Ramos | 2017-12-21 | 1 | -0/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | organise content by subject See merge request gitlab-org/gitlab-ce!16080 | ||||
| | * | | | | organise content by subjectorganise-by-subject | Job van der Voort | 2017-12-21 | 1 | -0/+4 |
| | |/ / / | |||||
| * | | | | Merge branch 'fj-40279-normalize-ldap-dn-api' into 'master' | Douwe Maan | 2017-12-21 | 5 | -1/+72 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | LDAP extern_uids are not normalized when updated via API Closes #40279 See merge request gitlab-org/gitlab-ce!16004 | ||||
| | * | | | LDAP extern_uids are not normalized when updated via API | Francisco Javier López | 2017-12-21 | 5 | -1/+72 |
| |/ / / | |||||
| * | | | Merge branch ↵ | Marcia Ramos | 2017-12-21 | 1 | -0/+50 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | '41342-add-ci-yml-example-for-browser-performance-testing-in-ce' into 'master' Add CI YML example for Browser Performance Testing in CE See merge request gitlab-org/gitlab-ce!16058 | ||||
| | * | | | Add CI YML example for CE41342-add-ci-yml-example-for-browser-performance-testing-in-ce | Joshua Lambert | 2017-12-20 | 1 | -0/+50 |
| | | | | | |||||
| * | | | | Merge branch '41227-document-volume-mounts-with-docker-dind' into 'master' | Achilleas Pipinellis | 2017-12-21 | 1 | -0/+15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Resolve "Docker volumes not mounted when using docker:dind" See merge request gitlab-org/gitlab-ce!16070 | ||||
| | * | | | | Document mounting volumes with Docker-in-Docker | Teresa e Junior | 2017-12-21 | 1 | -0/+15 |
| | | | | | | |||||
| * | | | | | Merge branch 'winh-fix-datetime_utility' into 'master' | Filipa Lacerda | 2017-12-21 | 1 | -5/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore missing language code in datetime_utility.js Closes #41248 See merge request gitlab-org/gitlab-ce!16009 | ||||
| | * | | | | | Restore missing language code in datetime_utility.js | Winnie Hellmann | 2017-12-21 | 1 | -5/+13 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'fix-remove-dead-spinach-steps' into 'master' | Nick Thomas | 2017-12-21 | 1 | -11/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove two unused step definitions from spinach See merge request gitlab-org/gitlab-ce!16047 | ||||
| | * | | | | | Remove two unused step definitions from spinach | Nick Thomas | 2017-12-20 | 1 | -11/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch '40063-markdown-editor-improvements' into 'master' | Filipa Lacerda | 2017-12-21 | 6 | -17/+46 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994 | ||||
| | * | | | | | | Add spec for previewing a note40063-markdown-editor-improvements | Annabel Dunstone Gray | 2017-12-20 | 3 | -2/+17 |
| | | | | | | | | |||||
| | * | | | | | | Hide & show toolbar on MR page | Annabel Dunstone Gray | 2017-12-18 | 2 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Fix formatting | Annabel Dunstone Gray | 2017-12-18 | 2 | -12/+12 |
| | | | | | | | | |||||
| | * | | | | | | Hide toolbar in markdown preview mode | Annabel Dunstone Gray | 2017-12-18 | 4 | -11/+25 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'qa/gb/add-dependencies-support-to-factories' into 'master' | Rémy Coutable | 2017-12-21 | 13 | -50/+327 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for defining explicit dependencies to QA factories Closes gitlab-qa#122 See merge request gitlab-org/gitlab-ce!15979 | ||||
| | * | | | | | | | Add support for defining explicit dependencies to QA factories | Grzegorz Bizon | 2017-12-21 | 13 | -50/+327 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'rs-remove-useless-definition' into 'master' | Douwe Maan | 2017-12-21 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a redundant `InvalidPathError` definition See merge request gitlab-org/gitlab-ce!16064 | ||||
| | * | | | | | | | Remove a redundant `InvalidPathError` definitionrs-remove-useless-definition | Robert Speicher | 2017-12-20 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already defined in `ExtractsPath`, which this controller includes. | ||||
| * | | | | | | | | Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master' | Douwe Maan | 2017-12-21 | 9 | -20/+253 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new last_commit_id param for create commit endpoint Closes #38356 See merge request gitlab-org/gitlab-ce!15922 | ||||
| | * | | | | | | | | Updates from last code review:38356-add-last_commit_sha-to-the-commit-api | Rubén Dávila | 2017-12-20 | 8 | -33/+153 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Apply some refactoring for code reuse - Add file status validation for Files::DeleteService - Write additional specs | ||||
| | * | | | | | | | | Check if file has been modified for each action provided. | Rubén Dávila | 2017-12-20 | 4 | -2/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When commiting multiple files we're now checking if any of those files has been modified by another commit and we're rejecting the new commit in this case. | ||||
| | * | | | | | | | | Add some initial specs for Files::MultiService class | Rubén Dávila | 2017-12-20 | 1 | -0/+54 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master' | Rémy Coutable | 2017-12-21 | 5 | -21/+52 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables ordering groups and their children by name in the web interface Closes #24962 et #36958 See merge request gitlab-org/gitlab-ce!16045 | ||||
| | * | | | | | | | | | Enable sorting by name in the Groups dropdown | Mark Fletcher | 2017-12-20 | 3 | -0/+42 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Employ Groups dropdown in admin view | Mark Fletcher | 2017-12-20 | 2 | -19/+7 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Accept options hash for Groups dropdown | Mark Fletcher | 2017-12-20 | 1 | -2/+3 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'winh-fix-transient-loadDiff-failure' into 'master' | Phil Hughes | 2017-12-21 | 1 | -5/+9 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix racing condition in Ajax call of merge_request_tabs_spec.js Closes #35294 See merge request gitlab-org/gitlab-ce!16012 | ||||
| | * | | | | | | | | Fix racing condition in Ajax call of merge_request_tabs_spec.jswinh-fix-transient-loadDiff-failure | Winnie Hellmann | 2017-12-20 | 1 | -5/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch ↵ | Robert Speicher | 2017-12-21 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb' into 'master' Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #diff_file_blob_raw_url Closes #41291 See merge request gitlab-org/gitlab-ce!16052 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |