summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '33609-hide-pagination' into 'master'Clement Ho2017-12-211-0/+16
|\ | | | | | | | | | | | | Do not show Vue pagination if only one page Closes #33609 See merge request gitlab-org/gitlab-ce!15999
| * Do not show Vue pagination if only one pageMario de la Ossa2017-12-211-0/+16
| |
* | Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-211-0/+11
|\ \ | | | | | | | | | | | | Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955
| * | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'Douwe Maan2017-12-212-8/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reduce cardinality of some of GitLab's Prometheus metrics and fix observed duration reporting. Closes #41045 See merge request gitlab-org/gitlab-ce!15881
| * | | Use seconds where possible, and convert to milliseconds for Influxdb consumptionPawel Chojnacki2017-12-212-10/+12
| | | |
| * | | Fix tests and formattingPawel Chojnacki2017-12-191-5/+6
| | | |
| * | | Make `System.monotonic_time` retun seconds represented by float with ↵Pawel Chojnacki2017-12-121-2/+2
| | | | | | | | | | | | | | | | microsecond precision
* | | | Merge branch 'bvl-patch-mr-serializer' into 'master'Douwe Maan2017-12-212-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fall back to the `MergeRequestWidgetEntity` Closes #41296 See merge request gitlab-org/gitlab-ce!16074
| * | | | Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-212-2/+10
| | | | | | | | | | | | | | | | | | | | When no serializer was passed.
* | | | | Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-2145-634/+695
| |_|/ / |/| | |
* | | | LDAP extern_uids are not normalized when updated via APIFrancisco Javier López2017-12-211-0/+27
|/ / /
* | | Merge branch '40063-markdown-editor-improvements' into 'master'Filipa Lacerda2017-12-211-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Hide toolbar in markdown preview mode Closes #40063 See merge request gitlab-org/gitlab-ce!15994
| * | | Add spec for previewing a note40063-markdown-editor-improvementsAnnabel Dunstone Gray2017-12-201-0/+15
| | |/ | |/|
* | | Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master'Douwe Maan2017-12-212-0/+208
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-apiRubén Dávila2017-12-202-5/+118
| | | | | | | | | | | | | | | | | | | | | | | | - 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ávila2017-12-201-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | 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 classRubén Dávila2017-12-201-0/+54
| | | |
* | | | Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'Rémy Coutable2017-12-211-0/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 dropdownMark Fletcher2017-12-201-0/+35
| |/ / /
* | | | Merge branch 'winh-fix-transient-loadDiff-failure' into 'master'Phil Hughes2017-12-211-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-failureWinnie Hellmann2017-12-201-5/+9
| | | | |
* | | | | Merge branch ↵Robert Speicher2017-12-211-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 urlClement Ho2017-12-201-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-rbRémy Coutable2017-12-201-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 Greiling2017-12-202-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Refactored d3 modules to instead of having a common_d3 dir, to use the micro ↵Jose Ivan Vargas2017-12-181-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | modules instead
| * | | | | | fixed specs and the non-rendering stat_graph_contributors_graphJose Ivan Vargas2017-12-181-1/+1
| | | | | | |
| * | | | | | optimized d3 v4 with a custom made bundleJose Ivan Vargas2017-12-181-1/+1
| | | | | | |
| * | | | | | Modified contributors graph to use d3 v4Jose Ivan Vargas2017-12-181-4/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docsRobert Speicher2017-12-202-20/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-b655a4a7Kim Carlbäcker2017-12-202-20/+2
| | |/ / / | |/| | | | | | | | This reverts merge request !15712
* | | | | Migrate to Project#empty_repo?zj-empty-repo-importerZeger-Jan van de Weg2017-12-201-4/+4
|/ / / /
* | | | Merge branch '38318-search-merge-requests-with-api' into 'master'Rémy Coutable2017-12-201-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search merge-requests with API" Closes #38318 See merge request gitlab-org/gitlab-ce!16029
| * | | | Add optional `search` param for Merge Requests APIMark Fletcher2017-12-201-0/+20
| | |/ / | |/| |
* | | | Merge branch ↵Douwe Maan2017-12-203-31/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhausted' into 'master' Fork and Import jobs only get marked as failed when the number of Sidekiq retries were exhausted Closes #39246 See merge request gitlab-org/gitlab-ce!15844
| * | | | Fork and Import jobs only get marked as failed when the number of Sidekiq ↵39246-fork-and-import-jobs-should-only-be-marked-as-failed-when-the-number-of-retries-was-exhaustedTiago Botelho2017-12-153-31/+61
| | | | | | | | | | | | | | | | | | | | retries were exhausted
* | | | | Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan2017-12-209-18/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add BlocksJsonSerialization model concern and include it in User Closes #37947 See merge request gitlab-org/gitlab-ce!14350
| * | | | | Call the correct method in the BlocksJsonSerialization specrs-blocks-json-serializationRobert Speicher2017-12-191-1/+1
| | | | | |
| * | | | | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-197-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
| * | | | | Add a JsonSerializationError class instead of raising SecurityErrorRobert Speicher2017-12-191-2/+2
| | | | | |
| * | | | | Add BlocksJsonSerialization model concern and include it in UserRobert Speicher2017-12-192-0/+18
| | |/ / / | |/| | |
* | | | | Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'Douwe Maan2017-12-201-0/+20
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Don't link LFS-objects multiple times. Closes #41241 See merge request gitlab-org/gitlab-ce!16006
| * | | | Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objectsBob Van Landuyt2017-12-191-0/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
* | | | Merge branch '41264-gitlab-projects-spec-failures' into 'master'Robert Speicher2017-12-193-10/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec failures in spec/lib/gitlab/git/gitlab_projects_spec.rb Closes #41264 See merge request gitlab-org/gitlab-ce!16015
| * | | | Prevent some specs from mangling the gitlab-shell checkoutNick Thomas2017-12-192-8/+5
| | | | |
| * | | | [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rbValery Sizov2017-12-191-2/+4
| |/ / /
* | | | Fix onion-skin re-entering stateClement Ho2017-12-191-13/+29
| | | |
* | | | Remove related links in MR widget when empty stateClement Ho2017-12-192-0/+41
| | | |
* | | | Show inline edit button for issuesClement Ho2017-12-192-7/+3
| | | |