Commit graph

3688 commits

Author SHA1 Message Date
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 640d51f4b6 Fix GFM in events
Fixes #2563
2013-01-16 18:09:49 +01:00
Riyad Preukschas 592d626dad Fix #2576 2013-01-16 17:31:11 +01:00
Riyad Preukschas 0dd8a26a3a Fix satellite path settings 2013-01-16 17:00:38 +01:00
Dmitriy Zaporozhets 3f252ed194 Merge pull request #2621 from jouve/default_setting
add default for Settings['satellites']
2013-01-16 07:42:46 -08:00
Cyril 31e338b8fd add default for Settings['satellites'] 2013-01-16 16:11:40 +01:00
Dmitriy Zaporozhets 729088a7af Owner can enable public mode for project 2013-01-16 16:54:01 +02:00
Dmitriy Zaporozhets a39c910619 added sctructure.md 2013-01-16 16:17:21 +02:00
Dmitriy Zaporozhets 13978f33d8 Merge pull request #2420 from koenpunt/patch-1
Remove wget dependency, now all curl
2013-01-16 05:20:24 -08:00
Dmitriy Zaporozhets 4c93d77f24 Merge pull request #2460 from calmh/expose-namespace
'namespace' should be exposed via the API
2013-01-16 05:05:45 -08:00
Dmitriy Zaporozhets 08426d336d Merge pull request #2538 from jouve/app_helper
clean application_helper a bit
2013-01-16 04:59:29 -08:00
Dmitriy Zaporozhets 369dbaf396 Merge pull request #1586 from Bregor/ber_to_string
Auth: Net::BER::BerIdentifiedStrings to Strings
2013-01-16 04:55:52 -08:00
Dmitriy Zaporozhets c9e6818ab6 Store repo satellites outside of tmp directory 2013-01-16 13:30:31 +02:00
Dmitriy Zaporozhets 3d57755b70 change roadmap 2013-01-15 22:54:03 +02:00
Dmitriy Zaporozhets fd522b3257 should be green build now :) 2013-01-15 19:18:52 +02:00
Dmitriy Zaporozhets cc54c66fd0 Fix spec/requests/notes_on_merge_requests_spec.r 2013-01-15 18:20:58 +02:00
Dmitriy Zaporozhets cf353bd34f Fixed spinach test 2013-01-15 17:12:53 +02:00
Dmitriy Zaporozhets 752eb2c11d more tests fixed 2013-01-15 16:36:35 +02:00
Dmitriy Zaporozhets b059de2ac7 Fix notes model specs 2013-01-15 15:19:14 +02:00
Dmitriy Zaporozhets 2191efd8ec fix notes_on_wall specs 2013-01-15 15:04:22 +02:00
Dmitriy Zaporozhets 953db8477e More fixes for test 2013-01-15 14:28:04 +02:00
Dmitriy Zaporozhets 211c06e419 Fix few test and notify for commit author 2013-01-15 13:37:20 +02:00
Dmitriy Zaporozhets 6ddacaf9bf Merge branch 'riyad-discussions' 2013-01-15 12:43:09 +02:00
Dmitriy Zaporozhets ac983319d3 fixing some test 2013-01-15 12:42:54 +02:00
Dmitriy Zaporozhets f598cc7897 change logic on line_code 2013-01-15 11:12:17 +02:00
Riyad Preukschas bda7fe38d0 Merge branch 'master' into discussions 2013-01-15 00:53:00 +01:00
Riyad Preukschas d28176b132 Replace commit diff note request specs with spinach features 2013-01-15 00:52:57 +01:00
Riyad Preukschas f8e1f4a7c9 Replace commit note request specs with spinach features 2013-01-15 00:52:55 +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
Riyad Preukschas 8ee5fce9d6 Add preliminary specs for notes on merge requests 2013-01-15 00:27:59 +01:00
Riyad Preukschas 74e48f070f Smaller fixes 2013-01-15 00:27:26 +01:00
Riyad Preukschas d8e697ac68 Merge pull request #2585 from timl/patch-1
Fix typo in installation guide.
2013-01-14 13:21:26 -08:00
Dmitriy Zaporozhets a36926216f line numbers for blame 2013-01-14 20:55:57 +02:00
Dmitriy Zaporozhets e98d478085 remove thin from production env. Use unicorn for foreman 2013-01-14 20:21:04 +02:00
Dmitriy Zaporozhets b6da734824 Merge pull request #2584 from jasl8r/public-grack-clone
Public HTTP clones and remove auth request for public projects
2013-01-14 10:13:02 -08:00
Tim Laszlo ba24e242d7 Update doc/install/installation.md
Change "th" to "the"
2013-01-14 09:28:33 -06:00
Jeremy Slater 80b8921a9a Public HTTP clones and remove auth request for public projects 2013-01-14 09:46:55 -05:00
Dmitriy Zaporozhets eff6d3c12b CHANGELOG for 4.1 2013-01-14 13:39:09 +02:00
Dmitriy Zaporozhets 23e338852c Dont set @project variable in list. Remove a bit of duplication in dash and group 2013-01-14 10:09:01 +02:00
Dmitriy Zaporozhets f716c0a1dd profjects filter with_push to project model 2013-01-14 09:44:27 +02:00
Dmitriy Zaporozhets 8543313bf5 Few more filters for admin / projects 2013-01-14 09:37:29 +02:00
Dmitriy Zaporozhets 68bfcd0521 Add public filter to admin projects 2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets 122acb2254 fix unauth for public 2013-01-13 17:25:18 +02:00
Dmitriy Zaporozhets 4c6224aad1 Public git read-only access via http 2013-01-13 17:25:18 +02:00
Riyad Preukschas eb626edd3f Replace all stat command line calls with ruby equivalents 2013-01-12 01:25:01 +01:00
Riyad Preukschas 4d0af232da Make method names clearer in check.rake 2013-01-12 01:24:57 +01:00
Riyad Preukschas a213d4b9e8 Move OS detection to task helpers and add detection of OS X 2013-01-12 01:24:51 +01:00
Riyad Preukschas fd836f5490 Update empty error messages and warn if not viewing the most recent wiki page 2013-01-11 21:04:21 +01:00