summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notesGrzegorz Bizon2015-12-071-2/+1
* Remove space before exclamation mark in award alertGrzegorz Bizon2015-12-051-1/+1
* Refactor note awards to reuse `emoji_pattern` and improve validatorGrzegorz Bizon2015-12-051-18/+14
* Make method `supports_award?` public in `Note`Grzegorz Bizon2015-12-031-2/+2
* Combine new javascript Flash methods into oneGrzegorz Bizon2015-12-032-7/+3
* Support emoji awards also in merge requestsGrzegorz Bizon2015-12-031-3/+4
* Add feature test for emoji-only diff notesGrzegorz Bizon2015-12-032-0/+23
* Pin flash message to top if award note is invalidGrzegorz Bizon2015-12-031-1/+3
* Add new features to javascript flash messageGrzegorz Bizon2015-12-032-6/+23
* Show flash message instead of alert when note is invalidGrzegorz Bizon2015-12-031-1/+2
* Add test for award-emoji being added as regular commentGrzegorz Bizon2015-12-032-13/+24
* Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-032-1/+10
* Render json message with errors if note didn't pass validationGrzegorz Bizon2015-12-031-10/+14
* Scroll to awards after adding emoji-award commentGrzegorz Bizon2015-12-032-1/+7
* Move note emoji-award implementation to note model (feature envy)Grzegorz Bizon2015-12-032-24/+33
* Support award-emoji notes only when it a comment for an issueGrzegorz Bizon2015-12-031-6/+17
* Add validator for award-emoji noteGrzegorz Bizon2015-12-031-0/+1
* Merge branch 'fix_master' into 'master' Valery Sizov2015-12-032-2/+2
|\
| * Fix failures in masterValery Sizov2015-12-032-2/+2
* | Merge branch 'deprecated_warnings' into 'master' Dmitriy Zaporozhets2015-12-038-29/+21
|\ \ | |/ |/|
| * Rails deprecation warning about log_levelValery Sizov2015-12-031-1/+1
| * fix Celluloid warningsValery Sizov2015-12-031-18/+3
| * fix deprecation messages in testsValery Sizov2015-12-036-10/+12
| * git rid of deprecated warningsdeprecated_warningsValery Sizov2015-12-021-0/+5
* | Merge branch 'test_fix' into 'master' Valery Sizov2015-12-031-1/+3
|\ \
| * | Fix broken spec related to MySQL and fractional seconds support.Rubén Dávila2015-12-031-1/+3
|/ /
* | Merge branch 'ui/consistency' into 'master' Dmitriy Zaporozhets2015-12-0232-49/+68
|\ \
| * | Brefer "Directory" over "Dir", "Files" over "Codeui/consistencyDouwe Maan2015-12-023-8/+9
| * | Use file-type specific file icon in blame view and diff itemDouwe Maan2015-12-022-8/+15
| * | Use monospace font for commit SHA in branch listDouwe Maan2015-12-022-2/+2
| * | Add plus icon to all "Add X" buttonsDouwe Maan2015-12-024-3/+6
| * | Add header title to import pagesDouwe Maan2015-12-0210-9/+19
| * | Don't use success state for "Download zip" buttonDouwe Maan2015-12-021-2/+2
| * | Use "Delete" in milestone and label delete buttons instead of "Remove"Douwe Maan2015-12-025-5/+5
| * | Don't use success state for explore projects search buttonDouwe Maan2015-12-021-1/+1
| * | Truncate submodule commit SHAs to 7 charactersDouwe Maan2015-12-021-2/+2
| * | Capitalize tab titlesDouwe Maan2015-12-023-5/+5
| * | Use same text color for commit box as issue titleDouwe Maan2015-12-021-4/+2
* | | Merge branch 'ui/no-minimal-height' into 'master' Dmitriy Zaporozhets2015-12-023-6/+8
|\ \ \
| * | | Remove minimum containe heightui/no-minimal-heightDouwe Maan2015-12-023-6/+8
| |/ /
* | | Merge branch 'ui/gl-padding' into 'master' Dmitriy Zaporozhets2015-12-0237-240/+200
|\ \ \
| * | | Fix styling of empty repo messageui/gl-paddingDouwe Maan2015-12-022-7/+4
| * | | Remove unused styleDouwe Maan2015-12-021-4/+0
| * | | Use consistent border colorDouwe Maan2015-12-021-2/+2
| * | | Consistent styling for dashboard groups gray blockDouwe Maan2015-12-021-2/+2
| * | | No bottom margin for form help blocksDouwe Maan2015-12-021-0/+4
| * | | Render all form controls at the same heightDouwe Maan2015-12-021-0/+2
| * | | Remove style duplication between snippet and issue detail pagesDouwe Maan2015-12-022-42/+9
| * | | Use table-holder where appropriateDouwe Maan2015-12-022-49/+51
| * | | Fix padding of no readme and empty repo messagesDouwe Maan2015-12-023-20/+20
View Lorry Controller Status