Commit Graph

51 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets c69b8e0459
Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-14 19:32:51 +03:00
Dmitriy Zaporozhets 349eaaa9c2
Fix gfm specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-06 12:15:05 +03:00
Dmitriy Zaporozhets 1e673c72a1
Improve markdown parsing
* dont try to build links for anchors like `#title-anchor`
* dont build relative url for project with empty repo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 10:13:38 +03:00
skv 9c046fea67 links to issues on main dashboard 2014-05-26 13:24:21 +00:00
Marin Jankovski bb89661365 Better name for config variable. 2014-05-13 15:34:00 +03:00
Marin Jankovski 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 656d9548bc Update markdown documentation, fix wiki spec. 2014-03-17 13:23:04 +01:00
Ciro Santillli 90bdcac6b1 Blob and tree gfm links to anchors work.
Fixes #6046
2014-02-23 09:47:52 +01:00
Ciro Santillli 61748c993d Headers have ids and link to their own id. 2014-02-11 16:23:33 +01:00
Andrey Kumanyaev 53bdcb53ae Fix relative links in markdown. Related to #6182 2014-01-29 17:48:59 +04:00
Dmitriy Zaporozhets 891ea6f6e6
Improve highlight for notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 18:18:18 +02:00
Dmitriy Zaporozhets 86e4f6e06d
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 17:36:30 +02:00
Marin Jankovski 54bcb6cc2a Merge branch 'master' into reference_relative_links
Conflicts:
	spec/models/project_spec.rb
2014-01-24 14:02:11 +01:00
Marin Jankovski 462161a3b0 Markdown helper spec for reference style relative links. 2014-01-23 10:43:04 +01:00
Dmitriy Zaporozhets c227aa44f9
Make changes to tests
* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 21:03:52 +02:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Dmitriy Zaporozhets 58eca3118a
Fix markdown helper spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-10 13:38:31 +02:00
Dmitriy Zaporozhets f539c8a306
Fix markdown tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-25 17:41:02 +02:00
Marin Jankovski 7dbbb6defe Rename method to avoid clashes. 2013-10-09 15:01:02 +02:00
Dmitriy Zaporozhets 0093554ad6 Add test and docs for markdown tables 2013-08-26 15:07:07 +03:00
Dmitriy Zaporozhets a73e068c06 Fixing tests after adding iid for issues/mr 2013-08-20 16:56:05 +03:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
2013-07-30 13:35:33 +03:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Izaak Alpert 3d7194f011 Merge Request on forked projects
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
2013-06-04 18:36:22 +03:00
Ben Bodenmiller de29a424e6 changed Gitlab to GitLab 2013-05-19 02:13:39 -07:00
Dmitriy Zaporozhets f536c13355 fixed test using repo with commits but old factory 2013-04-01 19:06:47 +03:00
Dmitriy Zaporozhets f5dec306fd Use project_with_code factory where necessary 2013-04-01 18:16:08 +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
Dmitriy Zaporozhets 26323046fd Decorate Gitlab::Git::Commit with Commit 2013-03-31 19:00:45 +03:00
Andrew8xx8 d4543eb5a7 Tests fixed 2013-03-25 11:20:14 +04:00
Dmitriy Zaporozhets 3d9bd6e3e7 fix gfm helper test 2013-03-20 13:41:18 +02:00
Dan Knox 7665b1de7e Use Gitlab Markdown for Markdown files and Gollum to render the rest.
This commit enables the usage of the Gitlab Markdown post processing
on all Markdown formatted files. For file types that do not contain
Markdown, it defaults to the Gollum native renderer to process the
content.
2013-03-13 23:31:08 -07:00
Andrew8xx8 e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Riyad Preukschas 886cf2f5be Fix GFM specs 2013-01-17 02:00:09 +01: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
Dmitriy Zaporozhets afbdbb0c95 Rspec fixes 2013-01-04 18:50:31 +02:00
Dmitriy Zaporozhets 1ba28aaef8 Implement UsersProject project_access validation 2012-12-22 19:52:28 +02:00
Dmitriy Zaporozhets 2398af9ab0 Fixed wierd gitlab markdown issue 2012-12-22 14:18:40 +02:00
Cyril 045b4c8fcd replace user.name by user.username in GFM 2012-12-07 04:46:29 +01:00
Riyad Preukschas 3d242a3154 Fix GitLab Markdown helper spec 2012-11-28 16:05:58 +01:00
Valeriy Sizov c4883ca225 Update linguist and pygments #1602 2012-10-02 16:29:03 +03:00
Robert Speicher 496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -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 ce3fb94939 Fix bug where parsing of emoji was unnecessarily dependent on @project being set 2012-09-08 01:11:44 +02: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 880a233e6d Add specs for parsing Emoji 2012-09-05 16:05:20 -04:00
Robert Speicher ef24576fc2 Redesign gfm helper specs
Should now be much clearer about what each spec is actually testing.
For example, instead of testing stuff like link classes and titles in
every single call, we only test those things once, in their own specs.
2012-09-02 13:40:14 -04:00