| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Execute project hooks and services after commit when moving an issuedm-issue-move-transaction-error | Douwe Maan | 2017-12-22 | 1 | -0/+12 |
| | | |||||
| * | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master' | Douwe Maan | 2017-12-21 | 2 | -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 consumption | Pawel Chojnacki | 2017-12-21 | 2 | -10/+12 |
| | | | |||||
| | * | Fix tests and formatting | Pawel Chojnacki | 2017-12-19 | 1 | -5/+6 |
| | | | |||||
| | * | Make `System.monotonic_time` retun seconds represented by float with ↵ | Pawel Chojnacki | 2017-12-12 | 1 | -2/+2 |
| | | | | | | | | | microsecond precision | ||||
| * | | Merge branch 'bvl-patch-mr-serializer' into 'master' | Douwe Maan | 2017-12-21 | 2 | -2/+10 |
| |\ \ | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+10 |
| | | | | | | | | | | | | | When no serializer was passed. | ||||
| * | | | Resolve "Decouple multi-file editor from file list" | Tim Zallmann | 2017-12-21 | 45 | -634/+695 |
| | | | | |||||
| * | | | LDAP extern_uids are not normalized when updated via API | Francisco Javier López | 2017-12-21 | 1 | -0/+27 |
| |/ / | |||||
| * | | Merge branch '40063-markdown-editor-improvements' into 'master' | Filipa Lacerda | 2017-12-21 | 1 | -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-improvements | Annabel Dunstone Gray | 2017-12-20 | 1 | -0/+15 |
| | | | | |||||
| * | | | Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master' | Douwe Maan | 2017-12-21 | 2 | -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-api | Rubén Dávila | 2017-12-20 | 2 | -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ávila | 2017-12-20 | 1 | -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 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 | 1 | -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 dropdown | Mark Fletcher | 2017-12-20 | 1 | -0/+35 |
| | |/ / / | |||||
| * | | | | 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 | 2 | -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 Vargas | 2017-12-18 | 1 | -9/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modules instead | ||||
| | * | | | | | | fixed specs and the non-rendering stat_graph_contributors_graph | Jose Ivan Vargas | 2017-12-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | optimized d3 v4 with a custom made bundle | Jose Ivan Vargas | 2017-12-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Modified contributors graph to use d3 v4 | Jose Ivan Vargas | 2017-12-18 | 1 | -4/+8 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge branch 'revert-b655a4a7' into 'master'41349-add-browser-performance-testing-to-auto-devops-docs | Robert Speicher | 2017-12-20 | 2 | -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-b655a4a7 | Kim Carlbäcker | 2017-12-20 | 2 | -20/+2 |
| | | |/ / / | |/| | | | | | | | | This reverts merge request !15712 | ||||
| * | | | | | Migrate to Project#empty_repo?zj-empty-repo-importer | Zeger-Jan van de Weg | 2017-12-20 | 1 | -4/+4 |
| |/ / / / | |||||
| * | | | | Merge branch '38318-search-merge-requests-with-api' into 'master' | Rémy Coutable | 2017-12-20 | 1 | -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 API | Mark Fletcher | 2017-12-20 | 1 | -0/+20 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch ↵ | Douwe Maan | 2017-12-20 | 3 | -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-exhausted | Tiago Botelho | 2017-12-15 | 3 | -31/+61 |
| | | | | | | | | | | | | | | | | | | | | | retries were exhausted | ||||
| * | | | | | Merge branch 'rs-blocks-json-serialization' into 'master' | Douwe Maan | 2017-12-20 | 9 | -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-serialization | Robert Speicher | 2017-12-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Only include the user's ID in the time_spent command's update hash | Robert Speicher | 2017-12-19 | 7 | -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 SecurityError | Robert Speicher | 2017-12-19 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Add BlocksJsonSerialization model concern and include it in User | Robert Speicher | 2017-12-19 | 2 | -0/+18 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master' | Douwe Maan | 2017-12-20 | 1 | -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-objects | Bob Van Landuyt | 2017-12-19 | 1 | -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 Speicher | 2017-12-19 | 3 | -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 checkout | Nick Thomas | 2017-12-19 | 2 | -8/+5 |
| | | | | | | |||||
| | * | | | | [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rb | Valery Sizov | 2017-12-19 | 1 | -2/+4 |
| | |/ / / | |||||
| * | | | | Fix onion-skin re-entering state | Clement Ho | 2017-12-19 | 1 | -13/+29 |
| | | | | | |||||
| * | | | | Remove related links in MR widget when empty state | Clement Ho | 2017-12-19 | 2 | -0/+41 |
| | | | | | |||||
| * | | | | Show inline edit button for issues | Clement Ho | 2017-12-19 | 2 | -7/+3 |
| | | | | | |||||
| * | | | | Fix tags in the Activity tab not being clickable | Mario de la Ossa | 2017-12-19 | 1 | -0/+55 |
| | | | | | |||||
| * | | | | Merge branch '36020-private-npm-modules' into 'master' | Douwe Maan | 2017-12-19 | 1 | -0/+47 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not generate links for private NPM modules in blob view Closes #36020 See merge request gitlab-org/gitlab-ce!16002 | ||||
| | * | | | | BlobViewer::PackageJson - if private link to homepage | Mario de la Ossa | 2017-12-18 | 1 | -3/+4 |
| | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |