summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Break in middle of word if a span within parallel viewparallel-diff-alignmentAnnabel Dunstone2016-04-251-0/+5
|
* Reduce width of parallel diffsAnnabel Dunstone2016-04-221-1/+5
|
* Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-0/+22
| | | | Closes #4228
* Merge branch 'label-text-color-sidebar' into 'master' Robert Speicher2016-04-211-1/+1
|\ | | | | | | | | | | | | | | | | Fixes text color on labels in sidebar Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color. With this, the text color comes from the JSON. See merge request !3846
| * Reverted link changesPhil Hughes2016-04-211-1/+1
| |
| * Removed console.logPhil Hughes2016-04-211-1/+0
| |
| * Fixes text color on labels in sidebarPhil Hughes2016-04-211-2/+3
| |
* | Remove float from iconAnnabel Dunstone2016-04-211-0/+5
| |
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-04-214-47/+34
|\ \
| * \ Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-214-47/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "create label" functionality on label dropdown **Issue sidebar** ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) **Issues page** ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
| | * \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-2023-153/+450
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-2028-199/+372
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| | * | | | Add is-link attribute to know if a menu item should not be stoppedAlfredo Sumaran2016-04-181-1/+1
| | | | | |
| | * | | | Remove $parentAlfredo Sumaran2016-04-181-6/+5
| | | | | |
| | * | | | Fix create label functionalityAlfredo Sumaran2016-04-151-41/+25
| | | | | |
| | * | | | Fix Label dropdown and organize codeAlfredo Sumaran2016-04-153-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/labels_select.js.coffee
| | * | | | Restore broken codeAlfredo Sumaran2016-04-151-9/+6
| | | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-04-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'issue_15434' into 'master' Jacob Schatz2016-04-211-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes XSS injection REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434 **Without the fix** ![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif) **With the fix** ![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif) See merge request !1952
| | * | | | | Remove unused paramAlfredo Sumaran2016-04-211-1/+1
| | | | | | |
* | | | | | | Merge branch 'diff-link-fix' into 'master' Jacob Schatz2016-04-211-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff highlight fixes This fixes a couple of issues with linking/highlight diff lines: - Fixed issue with lines not being selectable when expanding diff - Fixed issue with incorrect line being highlighted if line is in discussion view See merge request !3725
| * | | | | | | Fixed issue when scrolling to element and there is an expanderPhil Hughes2016-04-201-2/+2
| | | | | | | |
| * | | | | | | Fixed issue with incorrect line being highlighted if line is in discussion viewPhil Hughes2016-04-201-4/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '15445-file-renames' into 'master' Jacob Schatz2016-04-211-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File name change appears on one line Closes #15445 <img src="/uploads/51714555be63af16b810cf528de49192/Screen_Shot_2016-04-21_at_9.22.43_AM.png" width="500px"> See merge request !3854
| * | | | | | | File name change appears on one lineAnnabel Dunstone2016-04-211-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'note-username-text-color' into 'master' Jacob Schatz2016-04-211-0/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with author link color on dark diffs Correctly added a color to the author link ![Screen_Shot_2016-04-21_at_08.55.05](/uploads/ffa9e12e868c7b71fa4dd9244114274a/Screen_Shot_2016-04-21_at_08.55.05.png) Fixes #15444 See merge request !3847
| * | | | | | Fixed issue with author link color on dark diffsnote-username-text-colorPhil Hughes2016-04-211-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Revert "Merge branch 'sentry-js' into 'master' "Jacob Schatz2016-04-212-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab.
* | | | | | Merge branch 'issue_14678' into 'master' Jacob Schatz2016-04-201-1/+42
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refresh page according remaining todos Fixes #14678 See merge request !3428
| * | | | | Use Turbolinks to redirectissue_14678Alfredo Sumaran2016-04-181-1/+1
| | | | | |
| * | | | | Move declarationsAlfredo Sumaran2016-04-131-4/+3
| | | | | |
| * | | | | Reutilize existing method to update param valueAlfredo Sumaran2016-04-111-12/+3
| | | | | |
| * | | | | Merge branch 'master' into issue_14678Alfredo Sumaran2016-04-1126-149/+434
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/todos.js.coffee
| * \ \ \ \ \ Merge branch 'master' into issue_14678Alfredo Sumaran2016-04-0749-530/+1261
| |\ \ \ \ \ \
| * | | | | | | Get pagination options form the viewAlfredo Sumaran2016-04-011-9/+18
| | | | | | | |
| * | | | | | | Expose todos_per_page variableAlfredo Sumaran2016-03-301-3/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' into issue_14678Alfredo Sumaran2016-03-3017-107/+508
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/todos.js.coffee
| * | | | | | | | typoAlfredo Sumaran2016-03-281-6/+6
| | | | | | | | |
| * | | | | | | | Refresh page according remaining todosAlfredo Sumaran2016-03-281-0/+43
| | | | | | | | |
* | | | | | | | | Merge branch 'revert-diff-scroll' into 'master' Jacob Schatz2016-04-205-30/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap all code in diffs Closes #15382 Closes #15422 All diff code wraps to next line instead of scrolling <img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px"> See merge request !3838
| * | | | | | | | Wrap all code in diffsrevert-diff-scrollAnnabel Dunstone2016-04-205-30/+20
| | | | | | | | |
* | | | | | | | | Merge branch 'due-date-frontend' into 'master' Robert Speicher2016-04-205-5/+199
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add due date to issues Closes: #12709 See merge request !3614
| * | | | | | | | | Added variablesPhil Hughes2016-04-202-7/+12
| | | | | | | | | |
| * | | | | | | | | replace hyphens to commas when converting datePhil Hughes2016-04-201-2/+1
| | | | | | | | | |
| * | | | | | | | | Fixed date issue with timezonesPhil Hughes2016-04-201-1/+3
| | | | | | | | | |
| * | | | | | | | | Removed buttons instead clicking date sets itPhil Hughes2016-04-202-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with dropdown not being toggleable again
| * | | | | | | | | Updates sidebar valuePhil Hughes2016-04-201-0/+3
| | | | | | | | | |
| * | | | | | | | | Updated based on designsPhil Hughes2016-04-201-9/+44
| | | | | | | | | |
| * | | | | | | | | Fixed issue with bootstrap dropdown closing the calendarPhil Hughes2016-04-202-0/+9
| | | | | | | | | |
| * | | | | | | | | Fixed issue with selectbox not hidingPhil Hughes2016-04-201-1/+8
| | | | | | | | | |