| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '38677-render-new-discussions-on-diff-tab' into 'master'36248-repo-editor-double-border-under-repo-file-buttons | Filipa Lacerda | 2017-11-06 | 1 | -2/+19 |
| |\ | | | | | | | | | | | | | Added discussion_line_code value to note response and use it to query the right… Closes #38677 See merge request gitlab-org/gitlab-ce!14981 | ||||
| | * | FE review changes - remove internal details assertion and look for closest ↵ | Luke "Jared" Bennett | 2017-10-27 | 1 | -4/+0 |
| | | | | | | | | | form if no discussion_line_code | ||||
| | * | Add spec for root diff discussion note | Luke "Jared" Bennett | 2017-10-24 | 1 | -2/+22 |
| | | | |||||
| | * | Fix karma | Luke "Jared" Bennett | 2017-10-23 | 1 | -0/+1 |
| | | | |||||
| * | | Resolve "Convert autosize.js library to be a Yarn managed library" | Tim Zallmann | 2017-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | notes.js: use the original content when resetting the form | Ben Boeckel | 2017-10-19 | 1 | -0/+10 |
| |/ | | | | | | | Otherwise, when an error occurred, the content was escaped and re-escaped on every error. Fixes #37724 | ||||
| * | Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master' | Clement Ho | 2017-10-11 | 1 | -1/+6 |
| |\ | | | | | | | | | | | | | Cleanup data-page attribute after each Karma test Closes #38871 See merge request gitlab-org/gitlab-ce!14742 | ||||
| | * | Cleanup data-page attribute after each Karma test38871-cleanup-data-page-attribute-after-karma-test | Eric Eastwood | 2017-10-11 | 1 | -1/+6 |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871 | ||||
| * | | spec fixesph-gl-form-js-modules | Phil Hughes | 2017-10-11 | 1 | -11/+9 |
| |/ | |||||
| * | karma spec fixes | Phil Hughes | 2017-10-10 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'fix-comment-reflection' into 'security-9-5' | Jacob Schatz | 2017-09-07 | 1 | -0/+14 |
| | | | | | | Fix Live Comment XSS Vulnerability See merge request gitlab/gitlabhq!2183 | ||||
| * | Fix broken notes spec | Filipa Lacerda | 2017-08-11 | 1 | -1/+2 |
| | | |||||
| * | Fix broken spec for issuable shortcuts and notes | Filipa Lacerda | 2017-08-11 | 1 | -4/+5 |
| | | |||||
| * | Remove forgotten fdescribe | Filipa Lacerda | 2017-08-10 | 1 | -1/+1 |
| | | |||||
| * | Change fixtures of old tests | Filipa Lacerda | 2017-08-10 | 1 | -4/+4 |
| | | |||||
| * | Remove placeholder note when award emoji slash command is applied | Kushal Pandya | 2017-06-30 | 1 | -0/+45 |
| | | |||||
| * | Fix note highlight being added to new notes33916-make-note-highlight-toggle-boolean-explcit | Eric Eastwood | 2017-06-19 | 1 | -1/+1 |
| | | | | | | | | | Always use a explicit true/false value to set highlight because jQuery assumes `null` means toggle from whatever state and doesn't force false. Regressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098 | ||||
| * | Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master' | Sean McGivern | 2017-06-16 | 1 | -24/+24 |
| |\ | | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811 | ||||
| | * | Rename "Slash commands" to "Quick actions" | Eric Eastwood | 2017-06-15 | 1 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand` | ||||
| * | | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master' | Phil Hughes | 2017-06-15 | 1 | -0/+45 |
| |\ \ | |/ |/| | | | | | | | | | Fix note highlight being lost after real time update Closes #33483 See merge request !12098 | ||||
| | * | Fix note highlight being lost after real time update | Eric Eastwood | 2017-06-14 | 1 | -0/+45 |
| | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33483 | ||||
| * | | Fix autocomplete not working on note edit form | Eric Eastwood | 2017-06-14 | 1 | -0/+17 |
| |/ | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33529 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11278 | ||||
| * | Merge branch 'cherry-pick-dc2ac993' into 'security-9-2' | DJ Mountney | 2017-06-08 | 1 | -0/+39 |
| | | | | | | | Escapes html content before appending it to the DOM See merge request !2107 | ||||
| * | Improve user experience around slash commands in instant comments | Kushal Pandya | 2017-06-05 | 1 | -37/+96 |
| | | |||||
| * | Merge branch 'task-list-2' into 'master' | Filipa Lacerda | 2017-05-31 | 1 | -1/+3 |
| |\ | | | | | | | | | | | | | Update task_list to version 2.0.0 Closes #22470 See merge request !11525 | ||||
| | * | Use native change event in the spec to trigger addEventListener | Jared Deckard | 2017-05-23 | 1 | -1/+3 |
| | | | |||||
| * | | Fix up some notes tech debtfix-up-notes-technical-debt | Eric Eastwood | 2017-05-26 | 1 | -1/+0 |
| |/ | | | | | | | | | Fix up tech debt comments from @jschatz1 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757436 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757905 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757952 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28758013 | ||||
| * | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 1 | -0/+1 |
| | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
| * | Fix ability to edit diff notes multiple times | Kushal Pandya | 2017-05-18 | 1 | -0/+41 |
| | | |||||
| * | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-case | Eric Eastwood | 2017-05-18 | 1 | -8/+52 |
| | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449 | ||||
| * | Merge branch '24373-warning-message-go-away' into 'master' | Phil Hughes | 2017-05-16 | 1 | -0/+29 |
| |\ | | | | | | | | | | | | | Notes warning message should go away once resolved Closes #24373 See merge request !10823 | ||||
| | * | Notes: Warning message should go away once resolved | Jacopo | 2017-05-15 | 1 | -0/+29 |
| | | | | | | | | | Flash error messages disappear(`fadeOut`) automatically after any successful request | ||||
| * | | Improve slash command stripping, escape temporary note contents | Kushal Pandya | 2017-05-15 | 1 | -4/+42 |
| |/ | |||||
| * | Fix slash commands detection in comments | Kushal Pandya | 2017-05-11 | 1 | -6/+19 |
| | | |||||
| * | Fix Karma failures for jQuery deferreds | Kushal Pandya | 2017-05-05 | 1 | -129/+88 |
| | | |||||
| * | Add instant comments support | Kushal Pandya | 2017-05-05 | 1 | -5/+224 |
| | | |||||
| * | Add real-time note edits :chipmunk: | Eric Eastwood | 2017-05-03 | 1 | -43/+88 |
| | | |||||
| * | Add renderNote animation and added spec | Luke "Jared" Bennett | 2017-04-19 | 1 | -0/+152 |
| | | |||||
| * | fix overlooked window binding in spec filesremove-imports-loader-window-bind | Mike Greiling | 2017-02-17 | 1 | -1/+1 |
| | | |||||
| * | code style and test fixes | Simon Knox | 2017-02-14 | 1 | -1/+1 |
| | | | | | fix test following https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9172 | ||||
| * | update karma test to expect ajax instead of POST | Simon Knox | 2017-02-09 | 1 | -8/+6 |
| | | |||||
| * | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-27 | 1 | -3/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (389 commits) Document "No gems fetched from git repositories" policy [ci skip] Typos Small gramatical tweaks Typos Added PHP & NPM doc Use `:empty_project` where possible in request specs Add caching of droplab ajax requests Use `:empty_project` where possible in model specs Revert 3f17f29a Remove unused js response from refs controller Add MR id to changelog entry fixed small mini pipeline graph line glitch Prevent form to be submitted twice Fix Error 500 when repositories contain annotated tags pointing to blobs Fix /explore sorting (trending) Simplify wording in "adding an image" docs Remove "official merge window" from CONTRIBUTING.md [ci skip] Update repository check documentation Fixed flexbox and wrap issues Update two_factor_authentication.md ... | ||||
| | * | resolve all padded-blocks eslint violations | Mike Greiling | 2017-01-18 | 1 | -2/+1 |
| | | | |||||
| | * | resolve all semi and no-extra-semi eslint violations | Mike Greiling | 2017-01-18 | 1 | -2/+2 |
| | | | |||||
| * | | use ~ to reference non-local scripts instead of resolve.root | Mike Greiling | 2017-01-10 | 1 | -3/+3 |
| | | | |||||
| * | | include spec_helper within karma config rather than each individual test | Mike Greiling | 2017-01-10 | 1 | -1/+0 |
| | | | |||||
| * | | include common libraries within spec_helper | Mike Greiling | 2017-01-10 | 1 | -1/+0 |
| | | | |||||
| * | | fix spec_helper missing/broken references | Mike Greiling | 2017-01-10 | 1 | -0/+1 |
| | | | |||||
| * | | Swapped out teaspoon for karma | Luke "Jared" Bennett | 2017-01-10 | 1 | -4/+5 |
| |/ | |||||
| * | Merge branch ↵ | Alfredo Sumaran | 2017-01-06 | 1 | -3/+3 |
| |\ | | | | | | | | | | | | | | | | | | | '26226-generate-all-haml-fixtures-within-teaspoon-fixtures-task' into 'master' Precompile all frontend test fixtures Closes #26226 See merge request !8384 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |