| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add 'only history' option to notes filter | Felipe Artur | 2018-11-05 | 9 | -6/+37 |
| | | |||||
| * | Merge branch 'qa-batch-comments-e2e-tests' into 'master' | Nick Thomas | 2018-11-05 | 3 | -4/+4 |
| |\ | | | | | | | | | QA Selectors for Batch Comment E2E Automation See merge request gitlab-org/gitlab-ce!22681 | ||||
| | * | QA Selectors for Batch Comment E2E Automation | at.ramya | 2018-10-30 | 3 | -4/+4 |
| | | | |||||
| * | | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master' | Achilleas Pipinellis | 2018-11-01 | 2 | -2/+2 |
| |\ \ | | | | | | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683 | ||||
| | * | | Fix typos in comments and specs | George Tsiolis | 2018-11-01 | 2 | -2/+2 |
| | | | | |||||
| * | | | Prettify remaining files with differences in CE and EE | Mike Greiling | 2018-10-31 | 2 | -4/+12 |
| |/ / | |||||
| * | | Adding tests for filtering activities/comments in issues | Ramya Authappan | 2018-10-30 | 1 | -4/+3 |
| | | | |||||
| * | | Update gitlab-ui to 1.9.0 | Clement Ho | 2018-10-29 | 1 | -3/+3 |
| |/ | |||||
| * | Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4 | Mike Greiling | 2018-10-26 | 12 | -28/+160 |
| |\ | | | | | | | # Conflicts: # app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue | ||||
| | * | Impove diff discussion datamr-diff-data | Phil Hughes | 2018-10-24 | 2 | -16/+0 |
| | | | | | | | | | Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956 | ||||
| | * | Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵ | Oswaldo Ferreira | 2018-10-23 | 11 | -12/+160 |
| | | | | | | | | | requests" | ||||
| * | | Prettify performance_bar notes and profile modules | Mike Greiling | 2018-10-17 | 3 | -25/+8 |
| |/ | |||||
| * | Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master' | Phil Hughes | 2018-10-15 | 1 | -1/+13 |
| |\ | | | | | | | | | Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work" See merge request gitlab-org/gitlab-ce!22303 | ||||
| | * | Backport EE fixes to CE checking resolvability | André Luís | 2018-10-11 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | EE branch: 7921-fix-batch-comments-resolution fixes the checks to know whether discussion will be resolved upon posting a comment or not. It covers scenarios where Batch Comments are enabled and disabled. To minimise risk of conflicts between CE and EE, the checks have been backported. this.shouldResolve() will not exist in CE. | ||||
| * | | Fix broken file name navigation on MRs | Jacques Erasmus | 2018-10-11 | 1 | -0/+1 |
| |/ | |||||
| * | Resolve "Merge request buttons spacing incorrect" | Jacques Erasmus | 2018-10-08 | 1 | -1/+1 |
| | | |||||
| * | Backport CE changes for: [Frontend only] Batch comments on merge requests | André Luís | 2018-10-06 | 7 | -30/+93 |
| | | |||||
| * | Adding qa-selectors for e2e tests | Ramya Authappan | 2018-10-05 | 1 | -4/+11 |
| | | |||||
| * | Merge branch '51958-fix-mr-discussion-loading' into 'master' | Phil Hughes | 2018-10-04 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Fix MR discussion not loaded issue Closes #51958 See merge request gitlab-org/gitlab-ce!21982 | ||||
| | * | Fix MR discussion not loaded issue51958-fix-mr-discussion-loading | Mark Chao | 2018-10-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | Display `formatter` as the sole content of `position` object. This means `diff_file` data is not referenced, which is the caseu of "IOError: not opened for reading". | ||||
| * | | Merge branch '_acet-fix-diff-file-header' into 'master' | Mike Greiling | 2018-10-03 | 1 | -94/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix showing diff file header for renamed files Closes #48887 See merge request gitlab-org/gitlab-ce!22089 | ||||
| | * | | Fix showing diff file header for renamed files | Fatih Acet | 2018-10-03 | 1 | -94/+0 |
| | | | | |||||
| * | | | Merge branch '_acet-fix-placeholder-note' into 'master' | Phil Hughes | 2018-10-03 | 1 | -1/+2 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Fix placeholder note rendering. Closes #48933 See merge request gitlab-org/gitlab-ce!22078 | ||||
| | * | | Fix placeholder note rendering | Fatih Acet | 2018-10-03 | 1 | -1/+2 |
| | |/ | |||||
| * | | Highlight current user in comments and system notes | Winnie Hellmann | 2018-10-02 | 1 | -0/+4 |
| |/ | |||||
| * | Bump GitLab UI version and change the file imports to a single point of ↵jivl-bump-gitlab-ui | Jose Vargas | 2018-09-26 | 1 | -1/+1 |
| | | | | | entry notation | ||||
| * | Add gitlab-ui skeleton loading | Clement Ho | 2018-09-25 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'upgrade-eslint' into 'master' | Marin Jankovski | 2018-09-24 | 5 | -7/+7 |
| |\ | | | | | | | | | Upgrade eslint to v5.x See merge request gitlab-org/gitlab-ce!21825 | ||||
| | * | Resolve eslint-plugin-vue errors | Mike Greiling | 2018-09-20 | 5 | -7/+7 |
| | | | | | | | | | | | | | The eslint-plugin-vue upgrade had some breaking changes to vue/attribute-order which needed to be resolved in order to avoid disabling the rule entirely | ||||
| * | | Fixed karma spec for getNoteFormData | Phil Hughes | 2018-09-21 | 1 | -2/+2 |
| | | | | | | | | | Fixed toggling new notes caused by not returning the stores discussion | ||||
| * | | Use returned discussion from API | Phil Hughes | 2018-09-21 | 2 | -18/+7 |
| | | | | | | | | | | | | | | | We now use the returned discussion instead of re-fetching all of the discussions and filtering out the ones we don't need. This speeds up the process of creating a diff discussions by saving us another API request before we can render the discussion | ||||
| * | | Merge branch 'mr-discussion-expanding-bug-fixes' into 'master' | Filipa Lacerda | 2018-09-20 | 1 | -1/+4 |
| |\ \ | |/ |/| | | | | | Fixed hidden truncated diff lines not showing when expanded See merge request gitlab-org/gitlab-ce!21801 | ||||
| | * | Fixed hidden truncated diff lines not showing when expanded | Phil Hughes | 2018-09-18 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | `truncated_diff_lines` gets added to collapsed discussions when expanded at this point `truncated_diff_lines` doesn't exist and is therefore not reactive. This property gets added when creating discussions in order for it to start as a reactive property | ||||
| * | | Merge branch 'mr-legacy-diff-notes' into 'master' | Filipa Lacerda | 2018-09-19 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652 | ||||
| | * | | Updated LegacyDiffNote logic | Phil Hughes | 2018-09-17 | 1 | -2/+1 |
| | | | | |||||
| | * | | Moved legacy diff note check into util method | Phil Hughes | 2018-09-17 | 1 | -5/+2 |
| | | | | | | | | | | | | | Un-commented out expect checks in mutation spec | ||||
| | * | | Re-enable legacy diff notes on merge request diffs | Phil Hughes | 2018-09-17 | 1 | -1/+5 |
| | |/ | | | | | | | | | | | | | | | | | This re-enables legacy diff notes on the merge request diffs This feature was not workig correctly after the Vue refactor LegacyDiffNotes have no `position`, instead they only have a `line_code` As an extra, this also re-enables commenting on legacy diffs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873 | ||||
| * | | Unite green buttons under one css class | Dmitriy Zaporozhets | 2018-09-19 | 2 | -2/+2 |
| |/ | | | | | | Rename btn-new, btn-create and btn-save to btn-success Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'mr-widget-discussion-state-fix' into 'master' | Filipa Lacerda | 2018-09-17 | 1 | -3/+14 |
| |\ | | | | | | | | | Fixed MR widget unresolved discussions state See merge request gitlab-org/gitlab-ce!21705 | ||||
| | * | Use MR widget event_hub to dispatch update event | Phil Hughes | 2018-09-13 | 1 | -1/+2 |
| | | | | | | | | | | | Instead of relying on a global method, we now emit an event on the MR widget that tells it to check the status | ||||
| | * | Fixed MR widget unresolved discussions state | Phil Hughes | 2018-09-12 | 1 | -3/+13 |
| | | | | | | | | | | | | | | | | | After resolving a discussion on a merge request page the merge request widget state would not get updated meaning users would need to refresh the page to merge (if that option is enabled in the projects settings) https://gitlab.com/gitlab-org/gitlab-ce/issues/42882 | ||||
| * | | Create specs for diffs/components/app and update modules to export factory ↵ | Paul Slaughter | 2018-09-14 | 2 | -12/+4 |
| | | | | | | | | | functions | ||||
| * | | Merge branch 'mr-fixed-expanded-state-not-working' into 'master' | Mike Greiling | 2018-09-13 | 1 | -6/+1 |
| |\ \ | |/ |/| | | | | | | | | | Fixed resolved discussions not toggling expanded on changes tab Closes #51370 See merge request gitlab-org/gitlab-ce!21676 | ||||
| | * | Fixed resolved discussions not toggling expanded | Phil Hughes | 2018-09-13 | 1 | -6/+1 |
| | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370 | ||||
| * | | Use gitlab-ui loading icon | Clement Ho | 2018-09-11 | 2 | -9/+3 |
| |/ | |||||
| * | Merge branch 'tz-mr-new-datastructure' into 'master' | Mike Greiling | 2018-09-07 | 7 | -60/+84 |
| |\ | | | | | | | | | Vue MR Page - Data structure update See merge request gitlab-org/gitlab-ce!21062 | ||||
| | * | Cosmetic changes to let setup | Tim Zallmann | 2018-09-07 | 1 | -0/+1 |
| | | | |||||
| | * | Adapted so utils + actions don't include any mutations and mutations are ↵ | Tim Zallmann | 2018-09-07 | 2 | -4/+7 |
| | | | | | | | | | always against state | ||||
| | * | Fixes based on MR discussion around naming, mutations, handling of state | Tim Zallmann | 2018-09-07 | 2 | -2/+2 |
| | | | |||||
| | * | Added new tests for newly added mutations, actions, utils | Tim Zallmann | 2018-09-07 | 1 | -1/+0 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |