Commit graph

3587 commits

Author SHA1 Message Date
Nihad Abbasov 652d28f56b Merge pull request #1087 from m16a1/patch-1
Fix typo in spec
2012-07-13 06:12:55 -07:00
m16a1 a46a172ad9 Update master 2012-07-13 17:10:30 +04:00
Dmitriy Zaporozhets f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
randx 1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
randx b8425cf173 Last push widget improved 2012-07-10 21:26:41 +03:00
Dmitriy Zaporozhets 78af4683b1 Merge pull request #1075 from VonC/master
Look for 'gitolite_admin_uri' in the right section of 'gitlab.yml'.
2012-07-11 07:50:22 -07: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
Dmitriy Zaporozhets bb7dde0d94 Merge pull request #1065 from moregeek/rake_task_for_backup_whole_gitlab
add: rake task to backup/restore gitlab db and repos
2012-07-10 23:57:20 -07:00
randx d3862c0e57 CSS improvements & refactoring 2012-07-10 20:16:23 +03:00
Stefan Morgenthaler 4dae41d5dc Changes done as per feedback 2012-07-10 16:12:19 +02:00
Valeriy Sizov b58326afc6 Merge pull request #1069 from drt24/patch-1
Should append to .profile rather than overwriting it as it might have ex...
2012-07-10 06:16:42 -07:00
Daniel Thomas 4a21f09029 Should append to .profile rather than overwriting it as it might have existing contents 2012-07-10 12:47:30 +02:00
Dmitriy Zaporozhets 1dca367f22 Merge pull request #1067 from SaitoWu/bugfix/encoding
fix blame encoding error.
2012-07-10 01:08:31 -07:00
Saito c5b16f0998 fix blame encoding error. 2012-07-10 15:57:43 +08:00
Dmitriy Zaporozhets 6ca921ae85 Merge pull request #1064 from iamntz/menus_updater
Live issues counter updates
2012-07-09 23:03:09 -07:00
Staicu Ionut ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening
buttons on forms are disabled on submit (re-enabled after the request is complete)
2012-07-10 07:33:04 +03:00
Stefan Morgenthaler 12b34c8115 add: rake task to backup/restore gitlab db and repos 2012-07-10 00:01:05 +02:00
Nihad Abbasov 0f604e62fb refactor projects API 2012-07-06 06:36:43 -07:00
randx be1b40802d Api page in help 2012-07-06 03:05:12 +03:00
randx 6451e837bf Better event feed for dashboard 2012-07-06 02:16:41 +03:00
Nihad Abbasov 0daf53b759 fix devise migrations issue 2012-07-06 20:46:26 +05:00
Nihad Abbasov 9f520a65ba Merge pull request #1048 from NARKOZ/devise
uncomment authentication_token
2012-07-06 08:35:38 -07:00
Nihad Abbasov 0833b7ec5b oops, uncomment authentication_token 2012-07-06 21:33:08 +06: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
Al Tobey 7359133798 The gitlab.pub file probably shouldn't be world readable, but let's start with just making it read-only and not executable. 2012-07-05 15:25:53 -07:00
Dmitriy Zaporozhets 9497b1a76e Compare images 2012-07-05 23:19:37 +03:00
Dmitriy Zaporozhets 31bc2b9495 Fix tree css class conflict 2012-07-06 16:42:13 +03:00
Dmitriy Zaporozhets 0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03: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
Dmitriy Zaporozhets 7f207d4a87 Merge pull request #1030 from brynary/master
Add Code Climate badge
2012-07-05 09:39:24 -07:00
Dmitriy Zaporozhets bf519f64b0 Merge pull request #1043 from NARKOZ/api
API docs
2012-07-05 09:23:24 -07:00
Nihad Abbasov 4083cfa4de fix typo 2012-07-05 21:20:01 +06:00
Nihad Abbasov efa21573df return 404 when record not found 2012-07-05 08:12:09 -07:00
Nihad Abbasov f086676b7c add docs for existing API 2012-07-05 06:57:45 -07:00
Nihad Abbasov 5f38f67247 don't expose full user info unless needed 2012-07-05 06:47:00 -07:00
Dmitriy Zaporozhets df6a75d52d buttons margin fixed 2012-07-05 09:35:23 +03:00
Dmitriy Zaporozhets 4e0c2f00d3 Merge pull request #1026 from gitlabhq/inline_diff
Inline diff
2012-07-04 22:45:52 -07:00
randx 264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
Valeriy Sizov e3fed8aaf4 InlineDiff: fix bug "unmatched close parenthesis" 2012-07-05 00:57:12 +03:00
Dmitriy Zaporozhets 3ce629fded Merge pull request #1034 from NARKOZ/api
API version
2012-07-04 08:36:06 -07:00
Nihad Abbasov 61910eb8fa ability to update and get a raw snippet via API 2012-07-04 02:03:32 -07:00
Nihad Abbasov fbd559d44f add API version 2012-07-04 00:48:00 -07:00
Bryan Helmkamp 82946c0a23 Add Code Climate badge 2012-07-03 18:21:58 -03:00
Dmitriy Zaporozhets 031ae7756e Refactored navigation 2012-07-03 20:52:48 +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 abc360fea3 Merge branch 'feature/issues_sorting_disabled' of dev.gitlabhq.com:gitlabhq 2012-07-03 12:53:50 +00:00