summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '_acet-fix-unable-to-reply-resolved-nondiff-discussion' into ↵Phil Hughes2018-11-231-0/+44
|\ | | | | | | | | | | | | | | | | 'master' Allow commenting to resolved non-diff discussions Closes #54330 See merge request gitlab-org/gitlab-ce!23279
| * Allow commenting to resolved non-diff discussions_acet-fix-unable-to-reply-resolved-nondiff-discussionFatih Acet2018-11-221-0/+44
| |
* | Merge branch 'mr-file-tree-commit' into 'master'Filipa Lacerda2018-11-222-40/+21
|\ \ | | | | | | | | | | | | | | | | | | Show toggle tree button on merge request commits Closes #53019 See merge request gitlab-org/gitlab-ce!23238
| * | Show toggle tree button on merge request commitsPhil Hughes2018-11-222-40/+21
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
* | Merge branch 'fix-typos-occured' into 'master'Kushal Pandya2018-11-224-9/+9
|\ \ | |/ |/| | | | | Fix typos occured to occurred See merge request gitlab-org/gitlab-ce!23105
| * Merge remote-tracking branch 'origin/master' into fix-typos-occuredHiroyuki Sato2018-11-2118-44/+267
| |\ | | | | | | | | | | | | | | | Conflicts: - app/assets/javascripts/ide/stores/modules/pipelines/actions.js - spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
| * | Fix typos occured to occurredHiroyuki Sato2018-11-164-9/+9
| | |
* | | Remove redundant specs for tooltipGeorge Tsiolis2018-11-212-23/+0
| | |
* | | Eliminate duplicated wordsTakuya Noguchi2018-11-223-3/+3
| | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | Merge branch '53578-fe-deployment-status' into 'master'Phil Hughes2018-11-211-0/+28
|\ \ \ | |_|/ |/| | | | | | | | Adds missing status in deployment widget See merge request gitlab-org/gitlab-ce!23239
| * | Adds missing status in deployment widget53578-fe-deployment-statusFilipa Lacerda2018-11-201-0/+28
| | | | | | | | | | | | Renders created and canceled status in MR widget
* | | Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2018-11-218-19/+28
|\ \ \ | | | | | | | | | | | | | | | | Upgrade prettier to v1.15.2 See merge request gitlab-org/gitlab-ce!22893
| * | | Fix broken karma specsMike Greiling2018-11-205-6/+13
| | | |
| * | | Prettify all the thingsMike Greiling2018-11-203-13/+15
| |/ /
* | | Resolve "The reply shortcut can add any text of the page to the "comment" ↵Thomas Pathier2018-11-201-4/+140
| | | | | | | | | | | | text area"
* | | Added a test for open merge request filesPhil Hughes2018-11-201-3/+27
| | |
* | | Open first 10 merge request files in IDEPhil Hughes2018-11-201-0/+1
|/ / | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51635
* | Refine cursor positioning in Markdown Editor for wrap tags.Johann Hubert Sonntagbauer2018-11-201-1/+30
| |
* | Merge branch 'gt-fix-typo-in-notebook-props' into 'master'Fatih Acet2018-11-191-1/+1
|\ \ | | | | | | | | | | | | Fix typo in js (props, specs) See merge request gitlab-org/gitlab-ce!23103
| * | Fix typos in comments for jsGeorge Tsiolis2018-11-151-1/+1
| |/
* | Merge branch '52385-search-bar-for-dashboard-list' into 'master'Sean McGivern2018-11-191-6/+6
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Search filter bar for issues dashboard list" Closes #53584, #52430, and #52385 See merge request gitlab-org/gitlab-ce!22641
| * | Change string concat to template stringHeinrich Lee Yu2018-11-131-2/+2
| | |
| * | Update documentationHeinrich Lee Yu2018-11-131-1/+1
| | |
| * | Fix testsHeinrich Lee Yu2018-11-131-4/+4
| | |
* | | Don't show memory usage graph for unmerged MRsSimon Knox2018-11-191-2/+25
| | |
* | | Merge branch 'gt-rename-diffs-store-variable' into 'master'Phil Hughes2018-11-162-7/+7
|\ \ \ | | | | | | | | | | | | | | | | Rename diffs store variable See merge request gitlab-org/gitlab-ce!23123
| * | | Rename diffs store variableGeorge Tsiolis2018-11-152-7/+7
| | | |
* | | | Merge branch 'fix-typo-pipline-to-pipeline' into 'master'Grzegorz Bizon2018-11-161-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix typo pipline to pipeline See merge request gitlab-org/gitlab-ce!23129
| * | | Fix typo pipline to pipelinejumpyoshim2018-11-161-1/+1
| | | |
* | | | Merge branch '54021-empty-button' into 'master'Phil Hughes2018-11-151-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Prevents empty button in jobs empty state Closes #54021 See merge request gitlab-org/gitlab-ce!23072
| * | | Prevents empty button in jobs empty state54021-empty-buttonFilipa Lacerda2018-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | Returns `null` instead of an empty object to make sure Vue doesn't render the button
* | | | Merge branch 'notes-consistent-key-object-case' into 'master'Filipa Lacerda2018-11-1516-426/+424
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Made diff & note data consistent See merge request gitlab-org/gitlab-ce!22950
| * | | | Made diff & note data consistentPhil Hughes2018-11-1416-426/+424
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused many pain points when working with it. Part of the data was camel cased the other snake case. Other parts where snake case & then getting converted in components, this conversion has the potential for leaking memory. This changes that & makes it consistent with what it returned from the API, snake case.
* | | | Merge branch 'fl-gitlab-ui-cicd' into 'master'Clement Ho2018-11-141-5/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Updates pipeline code to use gitlab-ui See merge request gitlab-org/gitlab-ce!22999
| * | | Updates pipeline code to use gitlab-uiFilipa Lacerda2018-11-121-5/+3
| | |/ | |/| | | | | | | | | | Uses gltooltipDirective Removes whitespace
* | | Merge branch 'mr-expand-all-collapsed-files' into 'master'Filipa Lacerda2018-11-141-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix collapsed files not fully fully expanding Closes #53866 See merge request gitlab-org/gitlab-ce!23019
| * | | Fix collapsed files not fully fully expandingPhil Hughes2018-11-131-0/+22
| |/ / | | | | | | | | | | | | | | | | | | This fixes files that are collapsed by default not expanding when the expand all button is clicked. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53866
* | | Disable updating appearance of filter tokens for special valuesHeinrich Lee Yu2018-11-141-13/+44
| |/ |/|
* | Fixed image commenting on moved filesPhil Hughes2018-11-131-0/+20
|/
* Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-122-48/+0
|
* Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-121-2/+2
|\ | | | | | | | | | | | | Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-091-2/+2
| |
* | Merge branch 'mr-tree-filter-path-name' into 'master'Filipa Lacerda2018-11-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Changed diff tree filtering to path Closes #53781 See merge request gitlab-org/gitlab-ce!22978
| * | Changed diff tree filtering to pathPhil Hughes2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Previously it was using name which could make it hard to filter for the file you want in a certain folder. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781
* | | Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-121-0/+3
|\ \ \ | |/ / |/| | | | | | | | Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607
| * | Fixed failing note actions specPhil Hughes2018-11-091-0/+3
| |/
* | Updates clipboard button with gitlab-ui51259-gitlab-ui-replacementFilipa Lacerda2018-11-091-2/+0
|/ | | | | | Updates clipboard button component to use the new glTooltipDirective and the new glButton component from gitlab-ui
* Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'Sean McGivern2018-11-081-2/+2
|\ | | | | | | | | Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" See merge request gitlab-org/gitlab-ce!22891
| * Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-lineOswaldo Ferreira2018-11-071-2/+2
| | | | | | | | | | This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.
* | Discussions redesignFatih Acet2018-11-082-2/+92
|/