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
VonC
2600e80b41
Look for 'gitolite_admin_uri' in the right section
...
of 'gitlab.yml'.
gitlabhq\config\initializers\1_settings.rb looks for
'gitolite_admin_uri' in the 'git' section of 'gitlab.yml'
Actually, that setting is in the 'git_host' section.
If not fixed, the 'gitolite_admin_uri' would always be equals to
'git@localhost:gitolite-admin', even if the administrator wants
to have another user than 'git' in charge of that repo.
2012-07-11 16:37:34 +02:00
Stefan Morgenthaler
4dae41d5dc
Changes done as per feedback
2012-07-10 16:12:19 +02:00
Stefan Morgenthaler
12b34c8115
add: rake task to backup/restore gitlab db and repos
2012-07-10 00:01:05 +02:00
randx
be1b40802d
Api page in help
2012-07-06 03:05:12 +03:00
Dmitriy Zaporozhets
4c24cabf47
Merge pull request #1012 from NARKOZ/devise
...
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
2012-07-06 08:18:18 -07:00
Nihad Abbasov
6533711825
enable lockable strategy for users
2012-07-06 00:05:31 -07:00
Nihad Abbasov
2abd054b0c
update devise
2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets
d40b9ce26d
Admin gitolite logs. Refactored project creation. Few style fixes.
2012-07-05 21:59:37 +03:00
randx
369df86e71
Remove GITLAB_OPTS, fixed ldap user creation
2012-07-05 21:29:37 +03:00
randx
264ee0c5a1
Tabs styled. MR Get Patch
2012-07-05 01:26:23 +03:00
Dmitriy Zaporozhets
51f174b97f
fix port issue
2012-07-03 18:52:48 +03:00
Dmitriy Zaporozhets
00ef16a66c
Setting: Disable port if https
2012-07-03 18:34:47 +03:00
Dmitriy Zaporozhets
a2eda66b30
Disable issues sort. Recent issues on top. Fixed tests
2012-07-02 21:51:48 +03:00
randx
e00390b377
fix 80 port config
2012-07-01 13:24:47 +03:00
randx
ec1b1588ee
Improved header font
2012-07-01 13:11:17 +03:00
randx
1d543e6430
Finished with configs
2012-07-02 21:59:48 +03:00
Dmitriy Zaporozhets
9b337b8328
Epic: Gitlab configuration with default values
2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets
15a03e1d87
Merge pull request #1023 from SaitoWu/feature/https
...
Feature/https
2012-07-02 01:52:23 -07:00