summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'leipert-fix-mr-widget-header-margins' into 'master'Annabel Dunstone Gray2018-09-251-25/+35
|\
| * Fix merge request header marginsleipert-fix-mr-widget-header-marginsLukas Eipert2018-09-251-25/+35
* | Merge branch 'ide-remove-stage-buttons' into 'master'Filipa Lacerda2018-09-252-4/+1
|\ \
| * | Fixed alignment of changed icon in commit headide-remove-stage-buttonsPhil Hughes2018-09-251-0/+1
| * | Remove stage/unstage buttons from IDE commit list itemsPhil Hughes2018-09-201-4/+0
* | | Cleanup polling of merge request widget in testsWinnie Hellmann2018-09-251-0/+2
* | | Merge branch 'ce-7013-add-epics-close-support' into 'master'Douglas Barbosa Alexandre2018-09-253-1/+20
|\ \ \
| * | | Bacport FE changes from Closing Epicsce-7013-add-epics-close-supportJarka Košanová2018-09-243-1/+20
* | | | Merge branch 'ide-refactor-for-ee-specific' into 'master'Phil Hughes2018-09-252-9/+31
|\ \ \ \
| * | | | Refactor IDE index to support EE specific codePaul Slaughter2018-09-242-9/+31
* | | | | Use Vue component for job artifacts, Commit and Trigger VariablesFilipa Lacerda2018-09-256-188/+187
|/ / / /
* | | | Resolve "Collapsed open and closed sections in boards styling is broken"Andrea Leone2018-09-241-1/+9
| |_|/ |/| |
* | | Merge branch 'upgrade-eslint' into 'master'Marin Jankovski2018-09-2455-99/+101
|\ \ \
| * | | Switch to per-line rule exceptionsupgrade-eslintMike Greiling2018-09-211-2/+4
| * | | Resolve eslint-plugin-vue errorsMike Greiling2018-09-2053-96/+95
| * | | Upgrade eslint to v5Mike Greiling2018-09-202-3/+4
* | | | Merge branch 'dm-create-note-return-discussion' into 'master'Filipa Lacerda2018-09-245-53/+40
|\ \ \ \
| * | | | Changed `true` string to a booleanPhil Hughes2018-09-211-1/+1
| * | | | Fixed karma spec for getNoteFormDataPhil Hughes2018-09-211-2/+2
| * | | | Use returned discussion from APIPhil Hughes2018-09-214-53/+39
| * | | | Return discussion object from NotesController#create when return_discussion p...Douwe Maan2018-09-211-0/+1
* | | | | Align form labels following Bootstrap 4 docsAnnabel Dunstone Gray2018-09-211-1/+0
* | | | | Merge branch 'dz-issue-css-classes' into 'master'Annabel Dunstone Gray2018-09-215-14/+14
|\ \ \ \ \
| * | | | | Rename some css classes that are shared between issues and mrsDmitriy Zaporozhets2018-09-215-14/+14
| |/ / / /
* | | | | Correct Gitlab Capitalization in code filesMarcel Amirault2018-09-211-1/+1
|/ / / /
* | | | Merge branch '41040-long-webhook-url-problem' into 'master'Phil Hughes2018-09-211-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix long webhook URL overflow for custom integrationKukovskii Vladimir2018-09-111-0/+1
* | | | QA: Fix failure in merge_merge_request_from_fork_spec.rbMark Lapierre2018-09-201-3/+3
* | | | Merge branch '51549-runners-table' into 'master'Annabel Dunstone Gray2018-09-201-1/+1
|\ \ \ \
| * | | | Wrap content for admin runners tableFilipa Lacerda2018-09-201-1/+1
| | |/ / | |/| |
* | | | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-202-5/+8
|\ \ \ \
| * | | | load usage ping script on admin settings subpage onlyMartin Wortschack2018-09-112-5/+8
| | |/ / | |/| |
* | | | Merge branch 'mr-discussion-expanding-bug-fixes' into 'master'Filipa Lacerda2018-09-201-1/+4
|\ \ \ \
| * | | | Fixed hidden truncated diff lines not showing when expandedPhil Hughes2018-09-181-1/+4
* | | | | Merge branch '44768-lazy-load-xterm-css' into 'master'Phil Hughes2018-09-201-0/+2
|\ \ \ \ \
| * | | | | Lazy load xterm css colorsFilipa Lacerda2018-09-191-0/+2
* | | | | | Resolve "Link to file in Changes tab of MR no longer works for all files afte...André Luís2018-09-204-23/+76
| |_|_|/ / |/| | | |
* | | | | Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-196-14/+36
|\ \ \ \ \
| * | | | | 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
| * | | | | Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-176-11/+33
* | | | | | Merge branch 'refactor-main-js' into 'master'Phil Hughes2018-09-1940-138/+125
|\ \ \ \ \ \
| * | | | | | 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
View Lorry Controller Status