Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵ | Oswaldo Ferreira | 2018-10-23 | 3 | -2/+76 |
| | | | | requests" | ||||
* | Prettify all spec files | Mike Greiling | 2018-10-17 | 4 | -15/+12 |
| | |||||
* | enable jasmine/new-line-before-expect | Johann Hubert Sonntagbauer | 2018-10-17 | 7 | -2/+32 |
| | |||||
* | enable jasmine/new-line-between-declarations | Johann Hubert Sonntagbauer | 2018-10-09 | 1 | -0/+1 |
| | |||||
* | Merge branch '51958-fix-mr-discussion-loading' into 'master' | Phil Hughes | 2018-10-04 | 1 | -16/+8 |
|\ | | | | | | | | | | | | | 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 | -16/+8 |
| | | | | | | | | | | | | 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". | ||||
* | | Fix placeholder note rendering | Fatih Acet | 2018-10-03 | 1 | -0/+25 |
|/ | |||||
* | Added test for adding `truncated_diff_lines` to discussion | Phil Hughes | 2018-09-20 | 1 | -0/+35 |
| | |||||
* | Merge branch 'mr-widget-discussion-state-fix' into 'master' | Filipa Lacerda | 2018-09-17 | 1 | -0/+192 |
|\ | | | | | | | | | 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 | -4/+3 |
| | | | | | | | | | | 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 | -0/+193 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | | Fixed resolved discussions not toggling expanded | Phil Hughes | 2018-09-13 | 1 | -1/+35 |
|/ | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370 | ||||
* | Use ResourceLabelEvent for tracking label changes | Jan Provaznik | 2018-09-07 | 5 | -30/+70 |
| | |||||
* | Frontend: Proper gettext extraction with gettext-extractor | 🌴🇿🇦 Lukas Eipert (OOO until Summit) | 2018-08-16 | 1 | -1/+1 |
| | |||||
* | Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into ↵ | André Luís | 2018-08-01 | 4 | -26/+262 |
| | | | | | | 'master'" This reverts commit e0fe97ca4a506405af8e85368f2c69cda637e192. | ||||
* | Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'" | André Luís | 2018-08-01 | 1 | -2/+7 |
| | | | | This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7. | ||||
* | Revert "Merge branch '_acet-fix-mr-autosave' into 'master'" | André Luís | 2018-08-01 | 1 | -7/+2 |
| | | | | | This reverts commit 5ba542b1094bd8fd95d48d2ac834fd8605cf8fee, reversing changes made to 32c831ea2b8425c71c790b67fb8f2170f3d9955a. | ||||
* | Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'" | André Luís | 2018-08-01 | 4 | -262/+26 |
| | | | | | This reverts commit ced005f330419ec81657e852c5cb9124fdb29fbb, reversing changes made to 9b01b293ce5ddbaeedaf014cdc804af2c5e86416. | ||||
* | Resolve ""Jump to first/next unresolved discussion" jumps to resolved ↵ | André Luís | 2018-07-20 | 4 | -26/+262 |
| | | | | discussions" | ||||
* | Fix failing specs :fingers-crossed: | Fatih Acet | 2018-07-18 | 1 | -2/+7 |
| | |||||
* | Merge branch 'master' into 48237-toggle-file-comments | Filipa Lacerda | 2018-07-10 | 2 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ... | ||||
* | Use proper markdown rendering for previews | Brett Walker | 2018-07-06 | 1 | -0/+1 |
| | |||||
* | Resolve "MRs are showing some discussions as unresolved" | Simon Knox | 2018-07-05 | 4 | -10/+32 |
| | |||||
* | Prevent fetching diffs and discussions data unnecessarily on MR page | Fatih Acet | 2018-06-29 | 3 | -0/+31 |
| | |||||
* | Changes tab VUE refactoring | Felipe Artur | 2018-06-21 | 17 | -262/+451 |
| | |||||
* | Resolve "Remove “commented” from comment system notes" | Constance Okoghenun | 2018-06-19 | 1 | -1/+0 |
| | |||||
* | Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsis | Andreas Kämmerle | 2018-06-11 | 3 | -4/+4 |
| | |||||
* | Fix spec | Mark Chao | 2018-06-06 | 1 | -2/+2 |
| | |||||
* | Support smarter system notes | Jose Ivan Vargas | 2018-06-05 | 3 | -1/+642 |
| | |||||
* | Prevent awarding emoji when a project is archived | Bob Van Landuyt | 2018-04-11 | 4 | -3/+51 |
| | | | | This prevents performing the requests, and disables all emoji reaction buttons | ||||
* | Add noteableType to mock data object44939-epic-comment-thread-backports | Kushal Pandya | 2018-04-06 | 1 | -0/+1 |
| | |||||
* | Removes eslint disabled commentsfl-prettier-mock-data | Filipa Lacerda | 2018-03-29 | 1 | -412/+451 |
| | |||||
* | Add dispatch mock to the test helpervuex-action-helper-correctly-fail | Filipa Lacerda | 2018-03-29 | 1 | -2/+11 |
| | |||||
* | fixed failinng tests after helper change | Phil Hughes | 2018-03-29 | 1 | -69/+121 |
| | |||||
* | Don't show Jump to Discussion button on issue notes44717-no-resolve-issue | Simon Knox | 2018-03-28 | 1 | -5/+13 |
| | |||||
* | Update spec import path for vue mount component helper | George Tsiolis | 2018-03-20 | 2 | -2/+2 |
| | |||||
* | move render_gfm into behaviors directory | Mike Greiling | 2018-03-19 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into 44149-issue-comment-buttons | Filipa Lacerda | 2018-03-13 | 3 | -3/+79 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (29 commits) Fix provider server URL used when listing repos to import Fix inconsistent punctuation on MR form Update dependency for svgs Fix timestamp to include %M instead of %I for post-deploy migrations. Use Gitaly 0.89.0 Resolve "Hover style for sidebar dropdowns is wrong" fixed spec Respect the protocol in `expose_url` Fix removes source branch text being rendered in merged state Fix code and wiki search results when filename is non-ASCII Include the ee/ directory in backtraces Use GitLab fork of zaproxy Updates file extensions on Vue docs fixed note polling not sending updated last fetched at date added spec for polling Add changelog entry Use `list.id` for `:key` added mutation spec Bump parser and unparser gems to remove warnings fix polling not working correctly Fixed issue notes being duplicated ... | ||||
| * | Merge branch 'fix-duplicate-notes' into 'master' | Filipa Lacerda | 2018-03-12 | 3 | -3/+79 |
| |\ | | | | | | | | | | | | | | | | | | | Fixed issue notes being duplicated Closes #44099 See merge request gitlab-org/gitlab-ce!17671 | ||||
| | * | fixed note polling not sending updated last fetched at datefix-duplicate-notes | Phil Hughes | 2018-03-12 | 2 | -1/+66 |
| | | | | | | | | | | | | added spec for polling | ||||
| | * | added mutation spec | Phil Hughes | 2018-03-10 | 1 | -2/+13 |
| | | | |||||
* | | | Fix loading icon being visible in the wrong button44149-issue-comment-buttons | Filipa Lacerda | 2018-03-12 | 3 | -0/+96 |
|/ / | |||||
* | | require jQuery to be explicitly importedremove-jquery-globals | Mike Greiling | 2018-03-09 | 3 | -0/+3 |
|/ | |||||
* | Render MR Notes with Vue with behind a cookie | Fatih Acet | 2018-02-28 | 9 | -26/+232 |
| | |||||
* | Reuse getter42923-close-issue | Filipa Lacerda | 2018-02-12 | 2 | -1/+7 |
| | | | | Add loading button for better UX | ||||
* | Makes close/reopen issue request to inside the vue app | Filipa Lacerda | 2018-02-09 | 3 | -0/+85 |
| | |||||
* | Resolve "Cancelling a second comment edit doesn't return its state to before ↵ | Simon Knox | 2018-02-07 | 2 | -47/+66 |
| | | | | the edit" | ||||
* | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urls | Achilleas Pipinellis | 2018-01-25 | 1 | -1/+1 |
| | | | | | If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default. | ||||
* | Merge branch '41956-fix-ctrl-enter-binding-to-save-comment' into 'master' | Phil Hughes | 2018-01-12 | 2 | -2/+17 |
|\ | | | | | | | | | | | | | Fix Ctrl+Enter keyboard shortcut saving comment/note edit Closes #41956 See merge request gitlab-org/gitlab-ce!16415 | ||||
| * | Fix Ctrl+Enter keyboard shortcut saving comment/note edit41956-fix-ctrl-enter-binding-to-save-comment | Eric Eastwood | 2018-01-11 | 2 | -2/+17 |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956 |