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

261 commits

Author SHA1 Message Date
Nihad Abbasov d2ea858fbf move emoji module to lib 2012-10-05 07:42:23 -07:00
Nihad Abbasov 72395d7f6e no need to add fonts to assets path 2012-10-05 07:23:58 -07:00
Nihad Abbasov 317c928198 improve emoji checking performance 2012-10-05 07:23:58 -07:00
Nihad Abbasov 9e4f3147a0 specify HTTP verbs for match in routes 2012-10-05 07:23:57 -07:00
Dmitriy Zaporozhets f963d37408 Merge pull request #1592 from jouve/devise_layout 
make devise controllers use devise layout
 2012-10-03 07:06:08 -07:00
Dmitriy Zaporozhets 224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
randx 1b6a3dfec9 Move all stuff to groups controller 2012-10-02 20:42:15 +03:00
Dmitriy Zaporozhets d6363e9359 Admin Group scaffold -> new, show, index 2012-10-02 19:01:40 +03:00
Cyril 236fd1e63b all devise controller use devise layout 2012-09-29 13:06:53 +02:00
Dmitriy Zaporozhets 68f4b59738 Merge pull request #1569 from jouve/simplify_controllers2 
Simplify controllers and layout handling
 2012-09-27 12:53:01 -07:00
Cyril e563e948bb Merge branch 'master' into simplify_controllers2 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
 2012-09-27 12:25:52 +02:00
Nihad Abbasov a030e4b664 cleanup database.yml files 2012-09-27 02:56:20 -07:00
Robert Speicher 8432c9c176 Routes are now final 2012-09-26 16:45:00 -04:00
Robert Speicher afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00
Robert Speicher 6cb626ef51 Add Compare#index and Compare#create actions 
Create just redirects to our specially-formatted #show action
 2012-09-26 16:32:24 -04:00
Robert Speicher 99d391332f Add a "patch" MIME type, and render it like a normal view in Commit#show 2012-09-26 16:32:23 -04:00
Robert Speicher c058e3903e Finalize new routes 2012-09-26 16:32:23 -04:00
Robert Speicher 9d394250a8 Add an inflector to mark "commits" as uncountable 2012-09-26 16:32:23 -04:00
Robert Speicher 3574826920 Use Commits#show instead of Commits#index 
Takes tree-ish + path as ID
 2012-09-26 16:32:22 -04:00
Robert Speicher 169f16fb32 Remove Commits#compare, add CompareController 2012-09-26 16:32:22 -04:00
Robert Speicher 576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00
Robert Speicher 39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher 884eb73297 Enable tree resource, remove old tree routes 2012-09-26 16:32:21 -04:00
Robert Speicher a21abce94f Add tree-ish route placeholders, modify commit(s) routes 2012-09-26 16:32:20 -04:00
Cyril bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
Nihad Abbasov 83efcabc82 set activerecord whitelist_attributes to true 2012-09-26 11:18:35 -07:00
Nihad Abbasov c3907bef59 Merge pull request #1501 from caleywoods/master 
Update timeout comment in unicorn example config.
 2012-09-24 09:05:09 -07:00
Robert Speicher 6ddbee5d89 Consolidate all Resque-related initializers into "4_resque" 2012-09-22 11:26:22 -04:00
Robert Speicher 2cd0caaf73 Rename 4_resque_queues initializer to 4_resque 2012-09-22 11:20:04 -04:00
Caley Woods e3b149fae6 Update comment in example unicorn config 
The timeout was changed to 30 and the comment wasn't updated. Also I've seen several reports of this timeout not being long enough for quite a few people. It resulted in me getting a 502 bad gateway from nginx until I upped it. Perhaps could back to the default 60 would be better? I changed mine to 300, running on an AWS micro instance.
 2012-09-19 10:27:27 -05:00
Robert Speicher 259ca982da Add docs for customizing Redis, add example file 2012-09-18 21:53:27 -04:00
Robert Speicher bfed07ee20 Add an initializer to allow custom Resque configs 2012-09-18 21:45:09 -04:00
Robert Speicher 95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Robert Speicher d7eb797024 1.9 Hash syntax in routes.rb 
Also cleans up some alignment and removes unnecessary "to: " arguments
 2012-09-16 07:38:14 -04:00
Robert Speicher 94f91146f1 Limit admin/logs and admin/resque routes to the actions that are used 2012-09-16 07:38:14 -04:00
Robert Speicher 4f4c401f77 Don't instantiate Resque::Server in routes 
It still works, and it cleans up the output of `rake routes`.
 2012-09-16 07:38:14 -04:00
Tobias Pfeiffer 74cfab692f Renamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in line with the common used naming in the config directory. Plus seeing *.orig files I think of the leftovers of git merges, which left me puzzled for quite some time. 2012-09-15 20:26:08 +02:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
Robert Speicher 0d77209ea0 Be more resilient in the case of missing omniauth settings 
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
 2012-09-12 18:11:59 -04:00
randx acc5302c3f improve profile layout after omniauth changes 2012-09-12 18:56:44 +03:00
Dmitriy Zaporozhets 048d47e626 Refactorn oauth & ldap 2012-09-12 09:23:16 +03:00
Dmitriy Zaporozhets fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets 486de8c3f4 Refactoring auth 2012-09-12 07:48:22 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
 2012-09-12 06:49:52 +03:00
Nihad Abbasov ae9689f8ff remove cucumber completely 2012-09-10 06:40:57 -07:00
Florian Unglaub 6d6c7a17ea Allow single-sign-on with Omniauth 2012-08-31 15:45:50 +02:00
randx a56cec1132 specify gitolite-admin owner in config 2012-08-29 02:08:39 +03:00
randx ad3a88cfd3 Prepared for gitolite v3 2012-08-29 02:03:04 +03:00
Alex Denisov 761c17f282 Unused routes removed 2012-09-05 09:20:02 +03:00
Nihad Abbasov 6817a6a295 add kaminari config with default and max per_page values 2012-09-03 04:22:49 -07:00