summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #1569 from jouve/simplify_controllers2Dmitriy Zaporozhets2012-09-271-0/+4
|\ \ | | | | | | Simplify controllers and layout handling
| * \ Merge branch 'master' into simplify_controllers2Cyril2012-09-274-35/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/commits_controller.rb app/controllers/refs_controller.rb
| * | | layout selected by controller nameCyril2012-09-261-0/+4
| | | |
* | | | cleanup database.yml filesNihad Abbasov2012-09-273-19/+5
| |/ / |/| |
* | | Routes are now finalRobert Speicher2012-09-261-1/+0
| | |
* | | Use Rails.root.join where appropriateRobert Speicher2012-09-261-1/+1
| | |
* | | Add Compare#index and Compare#create actionsRobert Speicher2012-09-261-1/+1
| | | | | | | | | | | | Create just redirects to our specially-formatted #show action
* | | Add a "patch" MIME type, and render it like a normal view in Commit#showRobert Speicher2012-09-261-0/+2
| | |
* | | Finalize new routesRobert Speicher2012-09-261-10/+4
| | |
* | | Add an inflector to mark "commits" as uncountableRobert Speicher2012-09-261-0/+21
| | |
* | | Use Commits#show instead of Commits#indexRobert Speicher2012-09-261-13/+13
| | | | | | | | | | | | Takes tree-ish + path as ID
* | | Remove Commits#compare, add CompareControllerRobert Speicher2012-09-261-4/+1
| | |
* | | Add BlobController, remove Refs#blobRobert Speicher2012-09-261-7/+1
| | |
* | | Add BlameController, remove Refs#blame actionRobert Speicher2012-09-261-9/+1
| | |
* | | Enable tree resource, remove old tree routesRobert Speicher2012-09-261-13/+3
| | |
* | | Add tree-ish route placeholders, modify commit(s) routesRobert Speicher2012-09-261-1/+11
|/ /
* | set activerecord whitelist_attributes to trueNihad Abbasov2012-09-263-1/+10
| |
* | Merge pull request #1501 from caleywoods/masterNihad Abbasov2012-09-241-1/+1
|\ \ | |/ |/| Update timeout comment in unicorn example config.
| * Update comment in example unicorn configCaley Woods2012-09-191-1/+1
| | | | | | 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.
* | Consolidate all Resque-related initializers into "4_resque"Robert Speicher2012-09-224-23/+30
| |
* | Rename 4_resque_queues initializer to 4_resqueRobert Speicher2012-09-221-0/+0
|/
* Add docs for customizing Redis, add example fileRobert Speicher2012-09-181-0/+3
|
* Add an initializer to allow custom Resque configsRobert Speicher2012-09-181-0/+8
|
* Remove Projects#team actionRobert Speicher2012-09-161-1/+1
| | | | Uses TeamMembers#index instead, to be more RESTful
* 1.9 Hash syntax in routes.rbRobert Speicher2012-09-161-51/+52
| | | | Also cleans up some alignment and removes unnecessary "to: " arguments
* Limit admin/logs and admin/resque routes to the actions that are usedRobert Speicher2012-09-161-2/+2
|
* Don't instantiate Resque::Server in routesRobert Speicher2012-09-161-1/+1
| | | | It still works, and it cleans up the output of `rake routes`.
* Renamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in ↵Tobias Pfeiffer2012-09-151-0/+0
| | | | 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.
* Refactored profile areaDmitriy Zaporozhets2012-09-141-1/+2
|
* Be more resilient in the case of missing omniauth settingsRobert Speicher2012-09-121-4/+4
| | | | | | | 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).
* improve profile layout after omniauth changesrandx2012-09-121-3/+1
|
* Refactorn oauth & ldapDmitriy Zaporozhets2012-09-121-5/+10
|
* Cleanup after omniauthDmitriy Zaporozhets2012-09-121-2/+4
|
* Refactoring authDmitriy Zaporozhets2012-09-124-35/+57
|
* Merge branch 'master' of https://github.com/funglaub/gitlabhq into ↵Dmitriy Zaporozhets2012-09-122-5/+31
|\ | | | | | | | | | | | | | | | | | | funglaub-master Conflicts: Gemfile.lock app/helpers/application_helper.rb app/views/devise/sessions/new.html.erb db/schema.rb
| * Allow single-sign-on with OmniauthFlorian Unglaub2012-08-311-0/+2
| |
| * Merge branch 'master' of git://github.com/gitlabhq/gitlabhqFlorian Unglaub2012-08-245-5/+10
| |\
| * | Adding default values for omniauth settings so tests don't failtFlorian Unglaub2012-08-171-0/+4
| | |
| * | Omniauth SupportFlorian Unglaub2012-08-172-10/+31
| | |
* | | remove cucumber completelyNihad Abbasov2012-09-101-8/+0
| | |
* | | specify gitolite-admin owner in configrandx2012-08-292-0/+5
| | |
* | | Prepared for gitolite v3randx2012-08-291-2/+2
| | |
* | | Unused routes removedAlex Denisov2012-09-051-4/+0
| | |
* | | add kaminari config with default and max per_page valuesNihad Abbasov2012-09-031-0/+10
| | |
* | | Give Resque route a name and use that for the iframe srcRobert Speicher2012-08-311-1/+1
| | | | | | | | | | | | Closes #1350
* | | Use similar interface to access gitoliterandx2012-08-293-56/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Simplified gitolite handle logic Stubn over monkeypatch Stub only specific methods in Gitlab:Gitolite Moved grach auth to lib added specs for keys observer removes SshKey role
* | | Added hooks_path option exampleLeonB2012-08-281-0/+1
| | |
* | | Fixed some hardcoded pathsLeonB2012-08-281-0/+4
| | | | | | | | | | | | New config option: git_hooks_path
* | | Send notification on update UserProject relation (access changed)Alex Denisov2012-08-271-1/+1
| | |
* | | Merge pull request #1297 from SaitoWu/issues/1269Dmitriy Zaporozhets2012-08-251-5/+5
|\ \ \ | |_|/ |/| | fix git push body bigger than 112k problem