summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ide-diff-marker-cache-fix' into 'master'Tim Zallmann2018-04-193-13/+37
|\ | | | | | | | | Fixed IDE diff markers being cached too long See merge request gitlab-org/gitlab-ce!18311
| * Fixed IDE diff markers being cached too longPhil Hughes2018-04-113-13/+37
| |
* | Merge branch 'ide-staged-changes' into 'master'Tim Zallmann2018-04-1925-246/+775
|\ \ | | | | | | | | | | | | | | | | | | Added staged files state to IDE Closes #44842, #44844, and gitlab-ee#4541 See merge request gitlab-org/gitlab-ce!17898
| * \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-195-145/+226
| |\ \
| * | | updates to variable names to make more sensePhil Hughes2018-04-185-20/+17
| | | | | | | | | | | | | | | | fixed up duplicate is-collapsed classes
| * | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-1817-291/+441
| |\ \ \
| * \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-1745-628/+569
| |\ \ \ \
| * | | | | correctly dispose cached modelsPhil Hughes2018-04-111-1/+10
| | | | | |
| * | | | | updated iconsPhil Hughes2018-04-099-13/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed bug where unstaged file when discarded would not take staged file changes
| * | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0935-82/+1078
| |\ \ \ \ \
| * | | | | | fixed failing tests because of passed `null`Phil Hughes2018-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | added spec to check for `head` file
| * | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0751-726/+1399
| |\ \ \ \ \ \
| * | | | | | | added ability to have `head` file to compare againstPhil Hughes2018-04-066-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed files getting into an opened & active state when it shouldnt
| * | | | | | | fixed eslintPhil Hughes2018-04-061-1/+1
| | | | | | | |
| * | | | | | | updates to template text to be i18n readyPhil Hughes2018-04-065-27/+35
| | | | | | | |
| * | | | | | | fixed delayed update viewerPhil Hughes2018-04-054-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed `key` not being set to correct value
| * | | | | | | fixed staged/unstaged files not opening when another 1 is openPhil Hughes2018-04-053-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes eslint
| * | | | | | | fixed tab being clicked throwing an errorPhil Hughes2018-04-051-1/+1
| | | | | | | |
| * | | | | | | fixed changed icon showing after committingPhil Hughes2018-04-051-0/+1
| | | | | | | |
| * | | | | | | fixed staged content not updatingPhil Hughes2018-04-055-8/+25
| | | | | | | |
| * | | | | | | fixed typo in selectorPhil Hughes2018-04-051-4/+2
| | | | | | | |
| * | | | | | | fixed karma & eslintPhil Hughes2018-04-051-3/+1
| | | | | | | |
| * | | | | | | update staged files to correctly use pending tabPhil Hughes2018-04-055-42/+33
| | | | | | | |
| * | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0527-71/+202
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-04-0331-530/+943
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fixed alignment with iconsPhil Hughes2018-03-292-51/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed icon not showing correctly in tab
| * | | | | | | | | Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-2926-796/+848
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ide-staged-changesPhil Hughes2018-03-2719-147/+204
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | double click to stage & unstage fileside-staged-changesPhil Hughes2018-03-221-7/+11
| | | | | | | | | | | |
| * | | | | | | | | | | hide tooltip on collapse button when clickedPhil Hughes2018-03-223-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blur the collapse button on click
| * | | | | | | | | | | added tooltips to various icons in the sidebarsPhil Hughes2018-03-2211-101/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed SVG colors
| * | | | | | | | | | | spec fixesPhil Hughes2018-03-221-1/+4
| | | | | | | | | | | |
| * | | | | | | | | | | correctly stages and unstages filesPhil Hughes2018-03-2214-64/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after a commit the files are correctly reset correctly enables the ability to have different staged & unstaged changes in the same file
| * | | | | | | | | | | Added staged files state to IDEPhil Hughes2018-03-2217-187/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4541
* | | | | | | | | | | | Resolve "Get rid of branch element all in bottom bar in WEB IDE"André Luís2018-04-191-7/+0
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Resolve "Show `failure_reason` in jobs view content section"Mayra Cabrera2018-04-194-143/+224
| | | | | | | | | | |
* | | | | | | | | | | Resolve "View labels when editing labels in sidebar and board sidebar"André Luís2018-04-181-2/+2
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'ide-commit-box-highlight' into 'master'Filipa Lacerda2018-04-186-151/+258
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve web IDE commit input Closes #44832 See merge request gitlab-org/gitlab-ce!18389
| * | | | | | | | | | changed data into a array of objectsPhil Hughes2018-04-171-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this saves a load of computational stuff happening in the template the data the template recieves is the data that should be rendered
| * | | | | | | | | | updates to componentPhil Hughes2018-04-164-106/+72
| | | | | | | | | | |
| * | | | | | | | | | added specs to message_field.vuePhil Hughes2018-04-161-3/+9
| | | | | | | | | | |
| * | | | | | | | | | Improve web IDE commit inputPhil Hughes2018-04-165-60/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the web IDE commit message imput by highlighting any characters on the first line after 50 & every other line after 72 Closes #44832
* | | | | | | | | | | Merge branch '45271-collpased-diff-loading' into 'master'Phil Hughes2018-04-171-15/+31
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Collapsed diff spacing wrong when failed to load" Closes #45271 and #45317 See merge request gitlab-org/gitlab-ce!18351
| * | | | | | | | | | | Disable try again button while fetching the APIFilipa Lacerda2018-04-161-2/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Use different class for try again button in collapsed diffsFilipa Lacerda2018-04-161-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Remove unused importsFilipa Lacerda2018-04-131-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Render only one error message per diffFilipa Lacerda2018-04-131-16/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move html to haml file instead of JS
| * | | | | | | | | | | Fixes unresolved discussions rendering the error state instead of the diffFilipa Lacerda2018-04-121-6/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ide-tree-loading-fix' into 'master'Filipa Lacerda2018-04-171-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed loading state not showing in IDE tree list See merge request gitlab-org/gitlab-ce!18421
| * | | | | | | | | | | | Fixed loading state not showing in IDE tree listPhil Hughes2018-04-171-6/+2
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
View Lorry Controller Status