Riyad Preukschas
|
3022786948
|
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
|
2013-01-15 00:52:25 +01:00 |
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
|
Riyad Preukschas
|
db2c15369c
|
Merge branch 'master' into discussions
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
|
2012-12-23 01:03:57 +01:00 |
|
Cyril
|
045b4c8fcd
|
replace user.name by user.username in GFM
|
2012-12-07 04:46:29 +01:00 |
|
|
Riyad Preukschas
|
534bd5a268
|
Fix emoji generation and styling
|
2012-12-03 22:51:56 +01:00 |
|
|
Dmitriy Zaporozhets
|
c007325451
|
Merge pull request #1712 from riyad/use-gem-for-emoji
Use gem for Emoji
|
2012-10-18 00:28:47 -07:00 |
|
|
Riyad Preukschas
|
ce91014730
|
Fix use of Emoji
|
2012-10-18 01:10:35 +02:00 |
|
Valeriy Sizov
|
883d138f15
|
Fix 500 error when project is empty
|
2012-10-17 23:59:42 +03:00 |
|
|
Valeriy Sizov
|
7a0a552b43
|
revert
|
2012-10-17 15:21:16 +03:00 |
|
|
Valeriy Sizov
|
31f1cebe4b
|
Wiki style: move styles to right place
|
2012-10-17 15:17:27 +03:00 |
|
Nihad Abbasov
|
317c928198
|
improve emoji checking performance
|
2012-10-05 07:23:58 -07:00 |
|
Robert Speicher
|
b389247c02
|
Use Commit#show instead of Commits#show to view a single commit
Commits#show (plural) is going to be for showing commit history on a
specific path.
|
2012-09-26 16:32:21 -04:00 |
|
|
Robert Speicher
|
345c4d2a77
|
Update gfm so escaped text is still parsed for references
|
2012-09-19 20:21:35 -04:00 |
|
|
Robert Speicher
|
d993f66642
|
Fix HTML entities being parsed in GFM
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!
Closes #1308
|
2012-09-13 15:20:00 -04:00 |
|
|
Riyad Preukschas
|
d661b893c5
|
Prevent gfm() to leak changes to the string supplied through the _text_ argument
|
2012-09-08 01:58:12 +02:00 |
|
|
Riyad Preukschas
|
ce3fb94939
|
Fix bug where parsing of emoji was unnecessarily dependent on @project being set
|
2012-09-08 01:11:44 +02:00 |
|
|
Riyad Preukschas
|
5348ee6278
|
Fix Ruby anti-pattern in Markdown
|
2012-09-07 22:14:17 +02:00 |
|
|
randx
|
5cb9e7eedc
|
Fix emojii
|
2012-09-07 09:16:04 +03:00 |
|
|
Robert Speicher
|
3a63f6f316
|
Simplify EMOJI_PATTERN
|
2012-09-06 15:26:55 -04:00 |
|
|
Robert Speicher
|
8808c5fa8d
|
Merge branch 'master' into emoji
|
2012-09-06 15:23:42 -04:00 |
|
Alex Denisov
|
09a86bd4d6
|
Capitlization of /gitlab/i normalized. #1367
|
2012-09-06 11:21:35 +03:00 |
|
|
Robert Speicher
|
b3bbf53e9b
|
Set the size of emoji to be 20x20
Forgot they were so big!
|
2012-09-05 16:14:54 -04:00 |
|
|
Robert Speicher
|
67a6a0b29b
|
Change Gitlab::Markdown to a module; add emoji parsing
|
2012-09-05 16:07:39 -04:00 |
|
|
Robert Speicher
|
40d619107f
|
Add link_title to CommitDecorator
|
2012-09-02 13:40:14 -04:00 |
|
|
Riyad Preukschas
|
32ae7fb616
|
Improve GFM code documentation
|
2012-08-23 20:10:06 +02:00 |
|
|
Robert Speicher
|
b039a16946
|
GFM refactor: Move the actual parsing to a class under the Gitlab module
|
2012-08-14 04:37:18 -04:00 |
|