Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #1569 from jouve/simplify_controllers2 | Dmitriy Zaporozhets | 2012-09-27 | 1 | -0/+4 | |
|\ \ | | | | | | | Simplify controllers and layout handling | |||||
| * \ | Merge branch 'master' into simplify_controllers2 | Cyril | 2012-09-27 | 4 | -35/+34 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/commits_controller.rb app/controllers/refs_controller.rb | |||||
| * | | | layout selected by controller name | Cyril | 2012-09-26 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | cleanup database.yml files | Nihad Abbasov | 2012-09-27 | 3 | -19/+5 | |
| |/ / |/| | | ||||||
* | | | Routes are now final | Robert Speicher | 2012-09-26 | 1 | -1/+0 | |
| | | | ||||||
* | | | Use Rails.root.join where appropriate | Robert Speicher | 2012-09-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add Compare#index and Compare#create actions | Robert Speicher | 2012-09-26 | 1 | -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#show | Robert Speicher | 2012-09-26 | 1 | -0/+2 | |
| | | | ||||||
* | | | Finalize new routes | Robert Speicher | 2012-09-26 | 1 | -10/+4 | |
| | | | ||||||
* | | | Add an inflector to mark "commits" as uncountable | Robert Speicher | 2012-09-26 | 1 | -0/+21 | |
| | | | ||||||
* | | | Use Commits#show instead of Commits#index | Robert Speicher | 2012-09-26 | 1 | -13/+13 | |
| | | | | | | | | | | | | Takes tree-ish + path as ID | |||||
* | | | Remove Commits#compare, add CompareController | Robert Speicher | 2012-09-26 | 1 | -4/+1 | |
| | | | ||||||
* | | | Add BlobController, remove Refs#blob | Robert Speicher | 2012-09-26 | 1 | -7/+1 | |
| | | | ||||||
* | | | Add BlameController, remove Refs#blame action | Robert Speicher | 2012-09-26 | 1 | -9/+1 | |
| | | | ||||||
* | | | Enable tree resource, remove old tree routes | Robert Speicher | 2012-09-26 | 1 | -13/+3 | |
| | | | ||||||
* | | | Add tree-ish route placeholders, modify commit(s) routes | Robert Speicher | 2012-09-26 | 1 | -1/+11 | |
|/ / | ||||||
* | | set activerecord whitelist_attributes to true | Nihad Abbasov | 2012-09-26 | 3 | -1/+10 | |
| | | ||||||
* | | Merge pull request #1501 from caleywoods/master | Nihad Abbasov | 2012-09-24 | 1 | -1/+1 | |
|\ \ | |/ |/| | Update timeout comment in unicorn example config. | |||||
| * | Update comment in example unicorn config | Caley Woods | 2012-09-19 | 1 | -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 Speicher | 2012-09-22 | 4 | -23/+30 | |
| | | ||||||
* | | Rename 4_resque_queues initializer to 4_resque | Robert Speicher | 2012-09-22 | 1 | -0/+0 | |
|/ | ||||||
* | Add docs for customizing Redis, add example file | Robert Speicher | 2012-09-18 | 1 | -0/+3 | |
| | ||||||
* | Add an initializer to allow custom Resque configs | Robert Speicher | 2012-09-18 | 1 | -0/+8 | |
| | ||||||
* | Remove Projects#team action | Robert Speicher | 2012-09-16 | 1 | -1/+1 | |
| | | | | Uses TeamMembers#index instead, to be more RESTful | |||||
* | 1.9 Hash syntax in routes.rb | Robert Speicher | 2012-09-16 | 1 | -51/+52 | |
| | | | | Also cleans up some alignment and removes unnecessary "to: " arguments | |||||
* | Limit admin/logs and admin/resque routes to the actions that are used | Robert Speicher | 2012-09-16 | 1 | -2/+2 | |
| | ||||||
* | Don't instantiate Resque::Server in routes | Robert Speicher | 2012-09-16 | 1 | -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 Pfeiffer | 2012-09-15 | 1 | -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 area | Dmitriy Zaporozhets | 2012-09-14 | 1 | -1/+2 | |
| | ||||||
* | Be more resilient in the case of missing omniauth settings | Robert Speicher | 2012-09-12 | 1 | -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 changes | randx | 2012-09-12 | 1 | -3/+1 | |
| | ||||||
* | Refactorn oauth & ldap | Dmitriy Zaporozhets | 2012-09-12 | 1 | -5/+10 | |
| | ||||||
* | Cleanup after omniauth | Dmitriy Zaporozhets | 2012-09-12 | 1 | -2/+4 | |
| | ||||||
* | Refactoring auth | Dmitriy Zaporozhets | 2012-09-12 | 4 | -35/+57 | |
| | ||||||
* | Merge branch 'master' of https://github.com/funglaub/gitlabhq into ↵ | Dmitriy Zaporozhets | 2012-09-12 | 2 | -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 Omniauth | Florian Unglaub | 2012-08-31 | 1 | -0/+2 | |
| | | ||||||
| * | Merge branch 'master' of git://github.com/gitlabhq/gitlabhq | Florian Unglaub | 2012-08-24 | 5 | -5/+10 | |
| |\ | ||||||
| * | | Adding default values for omniauth settings so tests don't failt | Florian Unglaub | 2012-08-17 | 1 | -0/+4 | |
| | | | ||||||
| * | | Omniauth Support | Florian Unglaub | 2012-08-17 | 2 | -10/+31 | |
| | | | ||||||
* | | | remove cucumber completely | Nihad Abbasov | 2012-09-10 | 1 | -8/+0 | |
| | | | ||||||
* | | | specify gitolite-admin owner in config | randx | 2012-08-29 | 2 | -0/+5 | |
| | | | ||||||
* | | | Prepared for gitolite v3 | randx | 2012-08-29 | 1 | -2/+2 | |
| | | | ||||||
* | | | Unused routes removed | Alex Denisov | 2012-09-05 | 1 | -4/+0 | |
| | | | ||||||
* | | | add kaminari config with default and max per_page values | Nihad Abbasov | 2012-09-03 | 1 | -0/+10 | |
| | | | ||||||
* | | | Give Resque route a name and use that for the iframe src | Robert Speicher | 2012-08-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | Closes #1350 | |||||
* | | | Use similar interface to access gitolite | randx | 2012-08-29 | 3 | -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 example | LeonB | 2012-08-28 | 1 | -0/+1 | |
| | | | ||||||
* | | | Fixed some hardcoded paths | LeonB | 2012-08-28 | 1 | -0/+4 | |
| | | | | | | | | | | | | New config option: git_hooks_path | |||||
* | | | Send notification on update UserProject relation (access changed) | Alex Denisov | 2012-08-27 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #1297 from SaitoWu/issues/1269 | Dmitriy Zaporozhets | 2012-08-25 | 1 | -5/+5 | |
|\ \ \ | |_|/ |/| | | fix git push body bigger than 112k problem |