summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Switch to per-line rule exceptionsupgrade-eslintMike Greiling2018-09-211-2/+4
|
* Resolve eslint-plugin-vue errorsMike Greiling2018-09-2053-96/+95
| | | | | | 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
* Upgrade eslint to v5Mike Greiling2018-09-202-3/+4
| | | | | | We needed to disable a few eslint-config-airbnb-base rules in order to keep the number of line changes under control. These should be re-enabled asap.
* Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-196-14/+36
|\ | | | | | | | | | | | | Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652
| * Changed isDiscussionApplicableToLine to accept an objectPhil Hughes2018-09-182-2/+6
| |
| * Updated latestDiff logic to only be used to LegacyDiffNotesPhil Hughes2018-09-172-5/+3
| |
| * Updated LegacyDiffNote logicPhil Hughes2018-09-173-7/+8
| |
| * Moved legacy diff note check into util methodPhil Hughes2018-09-172-7/+4
| | | | | | | | Un-commented out expect checks in mutation spec
| * Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-176-11/+33
| | | | | | | | | | | | | | | | | | 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
* | Merge branch 'refactor-main-js' into 'master'Phil Hughes2018-09-1940-138/+125
|\ \ | | | | | | | | | | | | Refactor main.js content See merge request gitlab-org/gitlab-ce!19783
| * | Move shortcuts classes into behaviors/shortcutsMike Greiling2018-09-1829-31/+31
| | |
| * | Move findAndFollowLink to lib/utilsMike Greiling2018-09-184-4/+4
| | |
| * | Move GFM autocomplete setup, delete dispatcherMike Greiling2018-09-144-34/+21
| | |
| * | Move shortcuts instantiation into behaviorsMike Greiling2018-09-143-32/+37
| | |
| * | Move performance_bar setup to dispatcher to main.jsMike Greiling2018-09-142-8/+2
| | |
| * | Move search autocomplete from dispatcher to main.jsMike Greiling2018-09-143-11/+8
| | |
| * | Move preview_markdown.js to behaviorsMike Greiling2018-09-143-2/+2
| | |
| * | Move initFieldErrors from dispatcher to main.jsMike Greiling2018-09-132-8/+4
| | |
| * | Remove superfluous importMike Greiling2018-09-131-1/+0
| | |
| * | Move svg4everybody into polyfills and reorganizeMike Greiling2018-09-134-12/+21
| | |
* | | Unite green buttons under one css classDmitriy Zaporozhets2018-09-1912-12/+12
| | | | | | | | | | | | | | | | | | Rename btn-new, btn-create and btn-save to btn-success Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Improve cluster apps installation flowMike Greiling2018-09-182-256/+320
| | |
* | | Resolve "Move filter dropdown from Font Awesome to our own icons"Constance Okoghenun2018-09-183-5/+5
| | |
* | | Merge branch 'decouple-file-row-from-ide' into 'master'Filipa Lacerda2018-09-174-231/+322
|\ \ \ | | | | | | | | | | | | | | | | Decouple file row from IDE See merge request gitlab-org/gitlab-ce!21742
| * | | Decouple file row from IDEPhil Hughes2018-09-174-231/+322
| | | | | | | | | | | | | | | | | | | | | | | | This makes the file row component re-usable ouside of the Web IDE Pre-request for https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
* | | | Backport EE changes to ↵Lukas Eipert2018-09-171-3/+3
| | | | | | | | | | | | | | | | `app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js`
* | | | Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault2018-09-175-8/+8
| |_|/ |/| |
* | | Merge branch 'mr-widget-discussion-state-fix' into 'master'Filipa Lacerda2018-09-173-7/+19
|\ \ \ | |/ / |/| | | | | | | | Fixed MR widget unresolved discussions state See merge request gitlab-org/gitlab-ce!21705
| * | Use MR widget event_hub to dispatch update eventPhil Hughes2018-09-133-5/+7
| | | | | | | | | | | | | | | 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 statePhil Hughes2018-09-121-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
* | | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'Grzegorz Bizon2018-09-1412-92/+152
|\ \ \ | | | | | | | | | | | | | | | | Feature: State filter for admin runners view See merge request gitlab-org/gitlab-ce!19625
| * | | rename to IssuableFilteredSearchTokenKeysAlexis Reigel2018-08-296-12/+12
| | | | | | | | | | | | | | | | it's used for both issues and merge requests
| * | | use default value arguments syntaxAlexis Reigel2018-08-291-4/+4
| | | |
| * | | use filtered search bar for admin runnersAlexis Reigel2018-08-295-0/+40
| | | |
| * | | make FilteredSearchTokenKeys genericAlexis Reigel2018-08-207-92/+112
| | | | | | | | | | | | | | | | | | | | | | | | for the current usage for the issues search bar a specific instance of FilteredSearchTokenKeys is created, which contains the config for that case.
* | | | Create specs for diffs/components/app and update modules to export factory ↵Paul Slaughter2018-09-145-16/+10
| | | | | | | | | | | | | | | | functions
* | | | Merge branch 'mr-fixed-expanded-state-not-working' into 'master'Mike Greiling2018-09-131-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 expandedPhil Hughes2018-09-131-6/+1
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51370
* | | | | Display click to expand on collapsed diffsAndré Luís2018-09-131-1/+1
| |_|_|/ |/| | |
* | | | Use GitLab ui pagination component for groupsAdriel Santiago2018-09-113-12/+51
| |_|/ |/| |
* | | Use gitlab-ui loading iconClement Ho2018-09-1161-244/+80
| | |
* | | Remove unused GlModal import in delete wiki modalClement Ho2018-09-111-4/+0
|/ /
* | add tooltip directive from gitlab-uiSimon Knox2018-09-102-6/+4
| |
* | Resolve "On master, inline diff view contains extra `+` and `-` signs"Tim Zallmann2018-09-101-1/+2
| |
* | Resolve "Merge requests show outdated discussions on changes tab"André Luís2018-09-083-6/+35
| |
* | Resolve "Create new project: Re-add project name field"Martin Wortschack2018-09-083-7/+48
| |
* | Merge branch 'tz-mr-new-datastructure' into 'master'Mike Greiling2018-09-0727-426/+479
|\ \ | | | | | | | | | | | | Vue MR Page - Data structure update See merge request gitlab-org/gitlab-ce!21062
| * | Fix for a check that fails if no file can be selectedTim Zallmann2018-09-081-42/+46
| | |
| * | Fix typo on targetLine in mutationAndré Luís2018-09-071-1/+1
| | |
| * | Cosmetic changes to let setupTim Zallmann2018-09-073-57/+48
| | |
View Lorry Controller Status