summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Change vertical margin of page titles to 16pxwinh-page-title-marginWinnie Hellmann2018-09-261-1/+1
|
* Merge branch 'leipert-fix-mr-widget-header-margins' into 'master'Annabel Dunstone Gray2018-09-251-25/+35
|\ | | | | | | | | | | | | Fix margins in merge request header Closes #51726 See merge request gitlab-org/gitlab-ce!21878
| * 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
|\ \ | | | | | | | | | | | | | | | | | | Remove stage/unstage buttons from IDE commit list items Closes #51695 See merge request gitlab-org/gitlab-ce!21845
| * | 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
| | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51695
* | | 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
|\ \ \ | | | | | | | | | | | | | | | | CE port of Adding state to epics See merge request gitlab-org/gitlab-ce!21771
| * | | Bacport FE changes from Closing Epicsce-7013-add-epics-close-supportJarka Košanová2018-09-243-1/+20
| | | | | | | | | | | | | | | | Backport of js and vue files from closing epics
* | | | Merge branch 'ide-refactor-for-ee-specific' into 'master'Phil Hughes2018-09-252-9/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor IDE index to support EE specific code See merge request gitlab-org/gitlab-ce!21895
| * | | | Refactor IDE index to support EE specific codePaul Slaughter2018-09-242-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** - The web terminal feature is EE specific and will need to inject some specific options / functions into certain components.
* | | | | 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
|\ \ \ | | | | | | | | | | | | | | | | Upgrade eslint to v5.x See merge request gitlab-org/gitlab-ce!21825
| * | | 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 'dm-create-note-return-discussion' into 'master'Filipa Lacerda2018-09-245-53/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase performance when creating discussion on diff Closes #49002 See merge request gitlab-org/gitlab-ce!21743
| * | | | Changed `true` string to a booleanPhil Hughes2018-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | Fixed toBeTruthy to toBe(true) in spec
| * | | | Fixed karma spec for getNoteFormDataPhil Hughes2018-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | Fixed toggling new notes caused by not returning the stores discussion
| * | | | Use returned discussion from APIPhil Hughes2018-09-214-53/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now use the returned discussion instead of re-fetching all of the discussions and filtering out the ones we don't need. This speeds up the process of creating a diff discussions by saving us another API request before we can render the discussion
| * | | | Return discussion object from NotesController#create when return_discussion ↵Douwe Maan2018-09-211-0/+1
| | | | | | | | | | | | | | | | | | | | param is set
* | | | | 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 mrs See merge request gitlab-org/gitlab-ce!21856
| * | | | | Rename some css classes that are shared between issues and mrsDmitriy Zaporozhets2018-09-215-14/+14
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | 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 integration Closes #41040 See merge request gitlab-org/gitlab-ce!21668
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Admin Runners table not wrapping the content Closes #51549 See merge request gitlab-org/gitlab-ce!21802
| * | | | Wrap content for admin runners tableFilipa Lacerda2018-09-201-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | While refactoring the table into a responsive one we did not account for wrapping issues. This commit wraps some cells and truncates others. Adds `section-5` class to the responsive tables CSS
* | | | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-202-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
| * | | | 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 expanded See merge request gitlab-org/gitlab-ce!21801
| * | | | Fixed hidden truncated diff lines not showing when expandedPhil Hughes2018-09-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `truncated_diff_lines` gets added to collapsed discussions when expanded at this point `truncated_diff_lines` doesn't exist and is therefore not reactive. This property gets added when creating discussions in order for it to start as a reactive property
* | | | | Merge branch '44768-lazy-load-xterm-css' into 'master'Phil Hughes2018-09-201-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy load xterm css custom colors file Closes #44768 See merge request gitlab-org/gitlab-ce!21804
| * | | | | Lazy load xterm css colorsFilipa Lacerda2018-09-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually includes the xterm custom colors on the 3 files that will need it: job log page, job terminal page, environment terminal page Reduces main CSS bundle
* | | | | | Resolve "Link to file in Changes tab of MR no longer works for all files ↵André Luís2018-09-204-23/+76
| |_|_|/ / |/| | | | | | | | | | | | | | after incremental rendering improvement"
* | | | | 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
| | | | | | |
View Lorry Controller Status