summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ide-pending-tab' into 'master'Tim Zallmann2018-04-0414-118/+217
|\ | | | | | | | | Added pending tabs to IDE See merge request gitlab-org/gitlab-ce!17936
| * Updated components to PascalCasePhil Hughes2018-04-044-10/+13
| | | | | | | | Added comment for `key` usage
| * Merge branch 'master' into ide-pending-tabPhil Hughes2018-04-0360-479/+1798
| |\
| * | fixed karmaPhil Hughes2018-03-281-1/+3
| | |
| * | removed file changes that have no changes to make diff easierPhil Hughes2018-03-288-97/+71
| | | | | | | | | | | | | | | | | | simplified SET_FILE_ACTIVE openFiles map use .find in router so that it returns early instead of looping all the values
| * | refactor ADD_PENDING_TAB to stop multiple state changesPhil Hughes2018-03-282-39/+22
| | |
| * | remove italics from tabPhil Hughes2018-03-281-4/+0
| | |
| * | added specsPhil Hughes2018-03-281-10/+16
| | |
| * | replace the tab with the review pending tabPhil Hughes2018-03-281-12/+17
| | |
| * | stops opening a pending tab if current tab is in review mode alreadyPhil Hughes2018-03-282-3/+11
| | |
| * | remove pending tab when opening a file from the left sidebarPhil Hughes2018-03-283-13/+6
| | |
| * | remove extra state propertyPhil Hughes2018-03-286-54/+50
| | | | | | | | | | | | pending tabs now get added into openfiles & just filtered correctly
| * | fixed eslint inconsistent returnPhil Hughes2018-03-281-2/+3
| | |
| * | updated specsPhil Hughes2018-03-285-6/+6
| | |
| * | correctly toggle between tabsPhil Hughes2018-03-284-9/+18
| | |
| * | opens the next open tab correctlyPhil Hughes2018-03-286-76/+101
| | | | | | | | | | | | | | | fixes model being cached as undefined fixed open files not being correctly mutated
| * | fixed opening next tab being a pending tabPhil Hughes2018-03-282-12/+33
| | | | | | | | | | | | clears any active files when opening pending tab
| * | fix closing & reopening pending tabsPhil Hughes2018-03-289-50/+71
| | |
| * | toggling viewer mode closes the pending tabPhil Hughes2018-03-285-7/+33
| | | | | | | | | | | | then opens the file in edit mode
| * | Added pending tabs to IDEPhil Hughes2018-03-2811-203/+209
| | | | | | | | | | | | | | | | | | | | | Pending tabs are normal tabs that are opened from the right sidebar. They are opened in diff mode and when changed to edit mode they get closed & the actual file gets opened.
* | | Merge branch '41224-pipeline-icons' into 'master'Tim Zallmann2018-04-041-5/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cancel icons in pipeline dropdowns are misaligned" Closes #41224 and #37318 See merge request gitlab-org/gitlab-ce!18089
| * | | Increase dropdown width in pipeline graph & center action icon41224-pipeline-iconsFilipa Lacerda2018-03-291-5/+3
| | | |
* | | | Refactor discussions/notes codeJan Provaznik2018-04-037-5/+20
| |_|/ |/| |
* | | Resolve "Clicking confidential and lock icons on sidebar should also ↵Dennis Tang2018-04-026-162/+216
| | | | | | | | | | | | activate dropdown"
* | | Backport changes in EE MR 4972: System Header and FooterAndré Luís2018-04-024-15/+800
| | |
* | | Merge branch 'tz-ide-open-mr' into 'master'Phil Hughes2018-04-0128-392/+754
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Basic Setup for MR Showing Closes #44840 and #44839 See merge request gitlab-org/gitlab-ce!17952
| * | Fixed Utility Function based on Review CommentsTim Zallmann2018-03-283-11/+4
| | |
| * | Removed strangely added importTim Zallmann2018-03-281-2/+0
| | |
| * | Added Utility Function for WebIDE URLTim Zallmann2018-03-282-2/+13
| | |
| * | Fixed Code review CommentsTim Zallmann2018-03-288-70/+49
| | |
| * | Fixes for ESLint ErrorsTim Zallmann2018-03-282-4/+12
| | |
| * | Fixed Path to tooltip directiveTim Zallmann2018-03-281-1/+1
| | |
| * | Added Changes based on UX ReviewTim Zallmann2018-03-289-63/+100
| | |
| * | Re added The Web IDE ButtonTim Zallmann2018-03-281-43/+54
| | |
| * | Fixes for Tests on file.js and tabs testsTim Zallmann2018-03-281-23/+20
| | |
| * | Fix for MR Widget Header resetTim Zallmann2018-03-281-43/+43
| | |
| * | Fixes to Formatting to all FilesTim Zallmann2018-03-2814-202/+32
| | |
| * | ESLint + Karma fixesTim Zallmann2018-03-286-82/+26
| | |
| * | Fixed new AdditionsTim Zallmann2018-03-287-11/+15
| | | | | | | | | | | | Automatic Diff Navigation
| * | Actual MR diff displayedTim Zallmann2018-03-2816-339/+195
| | |
| * | Basic Setup for MR ShowingTim Zallmann2018-03-2823-314/+1006
| |/
* | Merge branch 'escape-autocomplete-values-for-markdown' into 'master'Phil Hughes2018-03-291-5/+14
|\ \ | | | | | | | | | | | | Escape autocomplete results for Markdown See merge request gitlab-org/gitlab-ce!18051
| * | Escape autocomplete results for MarkdownSean McGivern2018-03-291-5/+14
| |/ | | | | | | | | | | | | | | | | | | A label name can contain a `_`, `~~`, or other Markdown-significant characters. But label references are processed _after_ Markdown processing has run, so we can't easily fix this on the backend. We can make it more convenient, though, by changing the frontend to escape these characters so they aren't processed as Markdown, when we insert them from autocomplete.
* | Merge branch 'add-per-runner-job-timeout' into 'master'Kamil Trzciński2018-03-293-0/+52
|\ \ | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221
| * | Refactor build_metadataTomasz Maczukin2018-03-281-3/+9
| | |
| * | Rename used_timeout to timeoutTomasz Maczukin2018-03-281-2/+2
| | |
| * | Move job timeout information to new ci_builds_metadata tableTomasz Maczukin2018-03-281-4/+4
| | |
| * | Add few frontend improvementsTomasz Maczukin2018-03-283-2/+12
| | |
| * | Add link to timeout overriding documentation from job page sidebarTomasz Maczukin2018-03-282-0/+21
| | |
| * | Show timeout information on job's pageTomasz Maczukin2018-03-281-0/+15
| |/
View Lorry Controller Status