home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,598 Commits 48 Branches 340 Tags
cb4d8eff4cb158fbef4d59bf64e04e776e29eaed
Commit Graph
50 Commits
Author SHA1 Message Date
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Marin Jankovski 63c1cdce42 Show @all in autocomplete list. 2014-06-23 11:54:58 +02:00
Andrew Kumanyaev 45f9d15c0e Fix mistake in reference_jira_issue method 
Use local variable instead global
 2014-06-18 11:11:09 +04:00
skvandGitLab 9c046fea67 links to issues on main dashboard 2014-05-26 13:24:21 +00:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
 2014-05-13 15:33:38 +03:00
Marin Jankovski 9dd58c320a Add to changelog. 2014-03-25 18:53:09 +01:00
Marin Jankovski 02850210b6 Allow referencing an existing user. 2014-03-25 18:53:09 +01:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Daniel Lorch 686128cd68 JIRA project identifiers may also contain dashes '-' 2014-03-14 18:08:05 +01:00
Dmitriy Zaporozhets 6b206c9d96 Allow markdown tables 2013-08-26 14:27:19 +03:00
Dmitriy Zaporozhets 9acaec7a26 Searching for issue/mr by iid in markdown 2013-08-20 17:31:26 +03:00
Dmitriy Zaporozhets 49709b1d8a Fix broken user link in email 2013-08-04 16:27:32 +03:00
Dmitriy Zaporozhets 6577d3a49c Markdown now support users from groups 2013-06-22 00:06:21 +03:00
Pedro GuridiandPedro Guridi 5ec3129ea6 Changed regex to support Jira issue numbering format 
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123.

Added Jira Issue tracker configuration example
 2013-05-27 16:51:37 -03:00
Dmitriy Zaporozhets 31f007f79f Fix skipping of some elements in makrdown 2013-05-16 12:54:10 +03:00
Dmitriy Zaporozhets 0fccee82b7 Dont parse gfm-extractions as commit. Increase gfm rendering speed. Especially for a lot of code snippets 2013-05-16 12:15:42 +03:00
Dmitriy Zaporozhets 541d899410 Project.repository should never be nil so you can call repository.exists? or repository.empty? 
Also specify separate project factory for project with filled repo
 2013-04-01 16:56:25 +03:00
Martin Bastien 397c3da975 Fix user path in markdown 2013-03-19 21:29:59 -03:00
Andrew8xx8 9e8a818696 Issues helper included to markdown helper 2013-02-28 16:11:13 +04:00
Andrew8xx8 68a7ecdaaf Project issue tracker functions refactored 2013-02-28 16:10:00 +04:00
Andrew8xx8 e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Riyad Preukschas 2bc78739a7 Fix parsing of ref-like Urls in links and images in GFM 
Fixes #2166
 2013-01-16 22:39:56 +01:00
Riyad Preukschas 16b5417842 Use image Urls for Emoji in GFM 
Fixes #2617
 2013-01-16 22:39:45 +01:00
Riyad Preukschas 7635afd0c4 Use Urls for references in GFM 2013-01-16 22:08:01 +01:00
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