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
Robert Speicher
0de5d08e37
Give Resque route a name and use that for the iframe src
...
Closes #1350
2012-08-31 19:28:32 -04:00
randx
7cdc5b9e04
Use similar interface to access gitolite
...
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
2012-08-29 00:04:06 +03:00
LeonB
05fa1f167c
Added hooks_path option example
2012-08-28 13:06:05 +02:00
LeonB
c81d4ab4a9
Fixed some hardcoded paths
...
New config option: git_hooks_path
2012-08-28 10:57:23 +02:00
Alex Denisov
3c96d1f0e1
Send notification on update UserProject relation (access changed)
2012-08-27 00:32:03 +03:00
Florian Unglaub
48443d20ca
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
2012-08-24 15:25:52 +02:00
Dmitriy Zaporozhets
6e520d9cae
Merge pull request #1297 from SaitoWu/issues/1269
...
fix git push body bigger than 112k problem
2012-08-25 06:15:18 -07:00
Saito
74d65bb823
fix git push body bigger than 112k problem
2012-08-25 15:24:21 +08:00
randx
3dd7703b80
Feature: Labels page. Index page
2012-08-24 13:05:40 +03:00
Dmitriy Zaporozhets
1ef1a4ae6e
Merge pull request #1239 from tsigo/disable_gravatar
...
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets
aa50408ecb
1. Better message if no ssh key
...
2. SSH Keys Help page
2012-08-22 03:56:53 +03:00
Robert Speicher
2c128f3874
Remove rails-footnotes gem and its related files
2012-08-23 19:20:28 -04:00
randx
b2b88b2ff2
Added font for head panel. Major restyle for header
2012-08-20 22:51:37 +03:00
Florian Unglaub
c5ae1549a1
Adding default values for omniauth settings so tests don't failt
2012-08-17 16:32:22 +02:00
Florian Unglaub
a64aff2f1c
Omniauth Support
2012-08-17 15:20:55 +02:00
Robert Speicher
65bcc41f3e
Allow disabling Gravatars in gitlab.yml settings
...
Closes #1237
2012-08-15 21:06:08 -04:00
Robert Speicher
91a8cd240b
Fix invalid syntax in OmniAuth initializer sample
2012-08-11 19:33:59 -04:00
Dmitriy Zaporozhets
5fd0e7ba11
Merge pull request #1198 from NARKOZ/preview_notes
...
ability to preview notes
2012-08-10 06:42:31 -07:00
Nihad Abbasov
9639780359
render notes preview on server-side
2012-08-09 23:47:48 -07:00
Dmitriy Zaporozhets
839757598b
Wiki pages page
2012-08-09 07:34:29 +03:00
randx
34ba4e1352
Gitlab Markdown help page
2012-08-03 00:20:09 +03:00
randx
00b280c3f9
Feature: Bulk Issues update
2012-07-28 03:35:43 +03:00
Valeriy Sizov
d9cd6269e9
System Hooks: move callback to observer
2012-07-20 01:01:29 +03:00
Valeriy Sizov
c38578428b
System Hooks: CRUD has done
2012-07-19 00:25:10 +03:00
randx
1a2bacfb4b
Feature: ajax load for tree commit log
2012-07-10 22:52:38 +03:00