deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3661 commits 6 branches 43 tags 25 MiB
Commit graph

3661 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Riyad Preukschas b55ed840e6 Update wiki pages 
* Properly name columns in Pages and History views
* Link to Authors
* Make views more consistent
 2013-01-11 20:20:11 +01:00
Riyad Preukschas b3bfb75252 Fix link_to_member to not be bold by default 2013-01-11 20:16:37 +01:00
Riyad Preukschas 167f26b90d Add an ordering scope to Wiki 2013-01-11 20:04:14 +01:00
Riyad Preukschas 5aada8cc2a Move wiki delete button to the edit page 2013-01-11 20:03:43 +01:00
Riyad Preukschas e54246d310 Merge pull request #2561 from MrHammy/master 
Fix to pages links
 2013-01-11 10:20:23 -08:00
Riyad Preukschas f0c4e94d74 Move checks after init script installation in docs 2013-01-11 18:59:06 +01:00
David Southard 97a4e1b86a update grammar in check application status section 2013-01-11 17:23:35 +01:00
MrHammy c913f40ca4 Update app/views/wikis/pages.html.haml 
Changed the link in the pages of the wiki to the direct link instead of the first created page
 2013-01-11 13:40:29 +01:00
Dmitriy Zaporozhets 32dadb46fa Merge pull request #2555 from studiofrenetic/master 
Fix for archive download (method path missing)
 2013-01-10 13:02:15 -08:00
Martin Bastien f97ae2ff85 Fix for archive download (method path missing) 2013-01-10 15:55:34 -05:00
Dmitriy Zaporozhets 9152ab7955 Fix missing image for last push 2013-01-10 20:20:56 +02:00
Dmitriy Zaporozhets 0bd3c195a5 Merge branch 'improve/wiki_typography' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:36 +00:00
Dmitriy Zaporozhets 37771eb4cc Merge branch 'bug/pager_load' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:27 +00:00
Dmitriy Zaporozhets eadad85561 Merge branch 'improve/filter_icons' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:12 +00:00
Dmitriy Zaporozhets 50b172530c Merge branch 'improve/admin' of dev.gitlabhq.com:gitlab/gitlabhq 2013-01-10 16:59:01 +00:00
Dmitriy Zaporozhets e25656d09b Improve wiki typography 2013-01-10 18:09:12 +02:00
Dmitriy Zaporozhets dd20da1bff Fix pager loading on every page in application 2013-01-10 17:38:37 +02:00
Dmitriy Zaporozhets abc2bdc3aa Remove unused images. More use of font-awesome icons 2013-01-10 08:43:25 +02:00
Dmitriy Zaporozhets c2982c9a31 sidekiq.log in admin area. Improved admin dashboard 2013-01-10 08:43:25 +02:00
Dmitriy Zaporozhets 78698698dc Merge pull request #2539 from jameswritescode/remove_passenger_fix 
remove passenger_fix
 2013-01-09 22:35:10 -08:00
James Newton 2b38c8a156 remove passenger_fix.rb, which due to the recent removal of Resque in favor of sidekiq breaks gitlab in passenger 2013-01-09 22:17:03 -06:00
Riyad Preukschas 7cd03836e5 Fix sidekiq check task 2013-01-10 00:09:09 +01:00
Riyad Preukschas 4eac403e3b Fix sidekiq task to use Rails 2013-01-10 00:09:09 +01:00