summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' Dmitriy Zaporozhets2016-01-201-10/+7
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes tooltip doesn't duplicate the "me" name. Checks that "me" is not in the array of names in tooltip ![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978 See merge request !2454
| | | * | | | | Fixes issue where other emoji (not thumbup/thumbdown) were not removedawardemoji-tooltip-shows-people-multiple-timesJacob Schatz2016-01-191-1/+1
| | | | | | | |
| | | * | | | | Fix the situation where the user has named themselves "me"Jacob Schatz2016-01-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stopped looking for existing user since remove functionality is fixed.
| | | * | | | | Fix underlying issue with emoji reactionsJacob Schatz2016-01-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue was: blank space was rendering as a element in an array of authors. Element was being used by `join`. Original fix !2450 was trying to remove the space after it happened. This checks properly for it and only moves forward if it does not exist. Also removes "me" upon unchecking emoji.
| | | * | | | | Removing initial `,`.Jacob Schatz2016-01-181-1/+2
| | | | | | | |
| | | * | | | | Fixes tooltip doesn't duplicate the "me" name.Jacob Schatz2016-01-181-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks that "me" is not in the array of names in tooltip
| | * | | | | | Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-205-6/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "t" as a shortcut for find file anywhere See merge request !2507
| | | * | | | | | Simplifies the HAML if statement for project branch URLJacob Schatz2016-01-201-6/+2
| | | | | | | | |
| | | * | | | | | Fix HTML so code passessecret-shortcut-featureJacob Schatz2016-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was failing because branch was named `'test'` with quotes which was escaping the javascript I was using.
| | | * | | | | | Fix project find url so branch ref is not nilJacob Schatz2016-01-192-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds autocomplete="off" to find input.
| | | * | | | | | Proper spacing in HAML file `if` statement.Jacob Schatz2016-01-191-1/+1
| | | | | | | | |
| | | * | | | | | Removes `defined?` in favor to just `if`Jacob Schatz2016-01-191-1/+1
| | | | | | | | |
| | | * | | | | | Add reference to the correct branch.Jacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes `@ref` will be `nil`. this makes sure that the correct branch is passed in.
| | | * | | | | | Adds `t` as a shortcut for find file anywhereJacob Schatz2016-01-194-5/+4
| | | | | | | | |
| | * | | | | | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-201-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493
| | | * | | | | | | Update Issue/MR everytime a Note is saved/destroyed.Rubén Dávila2016-01-192-5/+2
| | | | | | | | | |
| | | * | | | | | | Check if object respond to #touch before update.Rubén Dávila2016-01-181-1/+2
| | | | | | | | | |
| | | * | | | | | | Update Issues/MRs updated_at when user leaves comments.Rubén Dávila2016-01-181-1/+3
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Remove `Compressed to` column from build artifacts browserci/artifacts-remove-compressed-sizeGrzegorz Bizon2016-01-203-4/+0
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | See #10982.
| * | | | | | | Properly highlight lines around '\ No newline at end of file'Douwe Maan2016-01-202-0/+9
| | | | | | | |
| * | | | | | | Save and use actual diff base commit for MR diff highlightingDouwe Maan2016-01-205-9/+30
| | | | | | | |
| * | | | | | | Fix MR diff_refsDouwe Maan2016-01-203-4/+4
| | | | | | | |
| * | | | | | | Restore helperDouwe Maan2016-01-201-0/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into issue_3945Douwe Maan2016-01-2072-122/+244
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Move parallel diff logic to separate classDouwe Maan2016-01-204-109/+5
| | | | | | | |
| * | | | | | | Check if MR is not broken.Rubén Dávila2016-01-191-1/+1
| | | | | | | |
| * | | | | | | Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-193-6/+10
| | | | | | | |
| * | | | | | | Merge branch 'master' into issue_3945Rubén Dávila2016-01-14345-1983/+2586
| |\ \ \ \ \ \ \
| * | | | | | | | More refactoring from last code review. #3945Rubén Dávila2016-01-148-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
| * | | | | | | | Use the adequate reference for the old rev. #3945Rubén Dávila2016-01-141-1/+1
| | | | | | | | |
| * | | | | | | | Add inline diff markers in highlighted diffs.Douwe Maan2016-01-143-4/+4
| | | | | | | | |
| * | | | | | | | Remove duplication around highlighting.Douwe Maan2016-01-141-15/+1
| | | | | | | | |
| * | | | | | | | Refactor parallel_diff generation a bit.Douwe Maan2016-01-143-57/+83
| | | | | | | | |
| * | | | | | | | Use current commit id if it doesn't have a parent. #3945Rubén Dávila2016-01-131-1/+1
| | | | | | | | |
| * | | | | | | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-133-7/+8
| | | | | | | | |
| * | | | | | | | Use html_safe instead of raw. #3945Rubén Dávila2016-01-131-2/+2
| | | | | | | | |
| * | | | | | | | Fix broken specs. #3945Rubén Dávila2016-01-121-1/+2
| | | | | | | | |
| * | | | | | | | Fix broken spec. #3945Rubén Dávila2016-01-121-1/+2
| | | | | | | | |
| * | | | | | | | Small fixes from code review. #3945Rubén Dávila2016-01-122-4/+4
| | | | | | | | |
| * | | | | | | | Reuse existent vars with ref and path. #3945Rubén Dávila2016-01-121-3/+1
| | | | | | | | |
| * | | | | | | | Make diff_line_content helper return a safe String. #3945Rubén Dávila2016-01-124-5/+5
| | | | | | | | |
| * | | | | | | | Fix css for other highlighting themes. #3945Rubén Dávila2016-01-093-0/+12
| | | | | | | | |
| * | | | | | | | Fix broken specs. #3945Rubén Dávila2016-01-081-2/+2
| | | | | | | | |
| * | | | | | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-0711-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
| * | | | | | | | Add some styling for syntax highlighting themes. #3945Rubén Dávila2016-01-077-2/+78
| | | | | | | | |
| * | | | | | | | Force white theme when viewing diffs. #3945Rubén Dávila2016-01-062-2/+2
| | | | | | | | |
| * | | | | | | | Use #html_safe instead of #raw in some diff views. #3945Rubén Dávila2016-01-063-5/+5
| | | | | | | | |
| * | | | | | | | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-312-2/+2
| | | | | | | | |
| * | | | | | | | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-302-3/+3
| | | | | | | | |
| * | | | | | | | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-305-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
View Lorry Controller Status