| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Skip projects filter on merge requests searchjprovazn-search | Jan Provaznik | 2017-12-21 | 5 | -3/+34 |
| | | | | | | | | | | | | | | | | When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540 | ||||
| * | 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 | ||||
| | * | | | | | | Stub old image diff url | Clement Ho | 2017-12-20 | 1 | -1/+2 |
| | | | | | | | | |||||
| | * | | | | | | Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of ↵41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb | Rémy Coutable | 2017-12-20 | 1 | -2/+2 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | #diff_file_blob_raw_url Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'jivl-replace-d3-v3-v4' into 'master' | Mike Greiling | 2017-12-20 | 12 | -76/+226 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update d3 to v4 to enable tree shaking (and reduce the size of our webpack bundles) Closes #37013 See merge request gitlab-org/gitlab-ce!15585 | ||||
| | * | | | | | | added minChunks to the common_d3 bundlejivl-replace-d3-v3-v4 | Jose Ivan Vargas | 2017-12-18 | 3 | -8/+4 |
| | | | | | | | | |||||
| | * | | | | | | Removed fills from stat_contributors_graph | Jose Ivan Vargas | 2017-12-18 | 1 | -3/+0 |
| | | | | | | | | |||||
| | * | | | | | | cleaned up date_time_formatters | Jose Ivan Vargas | 2017-12-18 | 1 | -17/+8 |
| | | | | | | | | |||||
| | * | | | | | | Restored the timeScaleFormat for the prometheus dashboard | Jose Ivan Vargas | 2017-12-18 | 2 | -6/+41 |
| | | | | | | | | |||||
| | * | | | | | | Refactored d3 modules to instead of having a common_d3 dir, to use the micro ↵ | Jose Ivan Vargas | 2017-12-18 | 9 | -131/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modules instead | ||||
| | * | | | | | | corrected functionality from the stat_contributors_graph | Jose Ivan Vargas | 2017-12-18 | 3 | -10/+25 |
| | | | | | | | | |||||
| | * | | | | | | fixed specs and the non-rendering stat_graph_contributors_graph | Jose Ivan Vargas | 2017-12-18 | 3 | -8/+7 |
| | | | | | | | | |||||
| | * | | | | | | optimized d3 v4 with a custom made bundle | Jose Ivan Vargas | 2017-12-18 | 10 | -151/+74 |
| | | | | | | | | |||||
| | * | | | | | | Modified contributors graph to use d3 v4 | Jose Ivan Vargas | 2017-12-18 | 3 | -28/+46 |
| | | | | | | | | |||||
| | * | | | | | | Update d3 to v4 and migrated the prometheus dashboard | Jose Ivan Vargas | 2017-12-18 | 5 | -47/+273 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docs | Robert Speicher | 2017-12-20 | 5 | -35/+16 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Move Repository#write_ref to Git::Repository#write_ref" Closes #41143 [ci skip] See merge request gitlab-org/gitlab-ce!16055 | ||||
| | * | | | | | Revert "Merge branch 'repo-write-ref-client-prep' into 'master'"revert-b655a4a7 | Kim Carlbäcker | 2017-12-20 | 5 | -35/+16 |
| | | |/ / / | |/| | | | | | | | | This reverts merge request !15712 | ||||
| * | | | | | Merge branch 'zj-empty-repo-importer' into 'master' | Stan Hu | 2017-12-20 | 3 | -5/+10 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Migrate to Project#empty_repo? Closes #41326 See merge request gitlab-org/gitlab-ce!16054 | ||||
| | * | | | | Migrate to Project#empty_repo?zj-empty-repo-importer | Zeger-Jan van de Weg | 2017-12-20 | 3 | -5/+10 |
| |/ / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |