Dmitriy Zaporozhets
fa3cc1dd24
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
2013-02-16 12:45:20 +00:00
Dmitriy Zaporozhets
b729728536
uppercase Gitlab version and revision constants. check api return gitlab version now
2013-02-16 14:42:22 +02:00
Dmitriy Zaporozhets
e65cc4f849
Merge pull request #2994 from dasbh/master
...
Fix gitlab:setup task on fresh installation
2013-02-16 01:10:36 -08:00
Dmitriy Zaporozhets
d6394a00f3
Merge pull request #3002 from nafu/repo_patch
...
Fix file_name for archive
2013-02-16 01:09:45 -08:00
Dmitriy Zaporozhets
c3a5aa159a
Merge pull request #3003 from livedata/patch-1
...
fixed API access to the project
2013-02-16 01:08:33 -08:00
Axilleas Pipinellis
a53f687fe6
Added creation of pids directory to fix #2995 , replaced deprecated nginx init.d command with service one, some more clean-up
2013-02-16 08:24:36 +02:00
Axilleas Pipinellis
b65e5b1e96
Nginx: edit actual file instead of symlink
2013-02-16 07:50:41 +02:00
livedata
bbd1bfd155
fixed API access to the project
2013-02-15 15:37:06 +01:00
Fumiya Nakamura
20868acc96
Fix file_path to correspond with the name
2013-02-15 05:50:42 -08:00
Fumiya Nakamura
a1d106110d
Fix file_name for archive
2013-02-15 05:00:15 -08:00
Axilleas Pipinellis
cdf95f1ce6
Added relative urls to other documentation files, removed duplicate debian update commands
2013-02-15 12:20:50 +02:00
Axilleas Pipinellis
46f7b7c1f2
Run db:setup and db:seed_fu before gitlab:setup
2013-02-15 11:53:35 +02:00
Axilleas Pipinellis
6178964929
Connect to database with git user, not gitlab
2013-02-15 11:52:10 +02:00
Jaakko Kantojärvi
6fd88b8cbb
Fix ssh key fingerprinting test to use exitcode
2013-02-15 11:16:21 +02:00
Dmitriy Zaporozhets
f6cc71bc36
Per project protection
2013-02-15 09:51:21 +02:00
Dmitriy Zaporozhets
4821aa6c25
skip protection to aws3
2013-02-15 09:49:35 +02:00
Dmitriy Zaporozhets
f9dd547aa7
remove commented code
2013-02-15 09:16:46 +02:00
Bhagavan Das
4bc7d98d65
Remove hardcoded refernce to gitlab-shell home. so that gitlab can be installed on any unix account other than git
2013-02-14 23:10:18 +00:00
Bhagavan Das
08dfbc962b
rename setup to setup_db so that it does not collide with gitlab 🐚 setup task
2013-02-14 21:39:48 +00:00
Riyad Preukschas
428af5ea62
Merge pull request #2890 from cameronyule/support_osx_groups
...
OS X support for gitlab:check rake tasks
2013-02-14 11:07:46 -08:00
Jaakko Kantojärvi
ba65f2910b
Add option to disable username changing
...
This option allows to disable users from changing their username.
This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.
You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
Jaakko Kantojärvi
1bf79f2443
Change .gitignore to ignore logrotated log files.
2013-02-14 17:43:20 +02:00
Dmitriy Zaporozhets
04186e9797
Merge pull request #2987 from Undev/support_env_in_settings
...
Environments support added to Gitlab config
2013-02-14 06:00:40 -08:00
Dmitriy Zaporozhets
7fad4a9636
Merge pull request #2989 from PierreGambarotto/master
...
archive download : namespace directory not created
2013-02-14 05:53:07 -08:00
Pierre Gambarotto
b6b6b640b1
fix archive download : not creating namespace directory
2013-02-14 14:29:24 +01:00
Dmitriy Zaporozhets
c9ca15e8d6
require missing lib
2013-02-14 15:25:55 +02:00
Dmitriy Zaporozhets
49cf9badbc
Gitlab::ShellEnv added
2013-02-14 15:17:43 +02:00
Dmitriy Zaporozhets
b698094d4d
Update post-receive worker to use correct identifier
2013-02-14 14:00:02 +02:00
Andrew8xx8
77a3bfe1de
Environments support added to Gitlab config
2013-02-14 11:44:34 +04:00
Dmitriy Zaporozhets
ed3f44085e
Redesign Admin -> user -> show page
2013-02-13 19:14:35 +02:00
Dmitriy Zaporozhets
6b24c375cb
style admin -> users page. Search by username too
2013-02-13 17:28:28 +02:00
Dmitriy Zaporozhets
fd5dc597ed
Add placeholder for project import
2013-02-13 15:27:18 +02:00
Dmitriy Zaporozhets
f4c8df897d
Merge branch 'mikew-unicorn-app-dir-fix'
2013-02-13 15:11:37 +02:00
Dmitriy Zaporozhets
2ea12ff663
Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix
...
Conflicts:
config/unicorn.rb.example
2013-02-13 15:11:26 +02:00
Dmitriy Zaporozhets
95e4217a2b
Merge pull request #2979 from Undev/fix_naming
...
Constants in Events looks good now
2013-02-13 04:33:01 -08:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Dmitriy Zaporozhets
b9f8b40190
Merge pull request #2971 from yuters/patch-1
...
Some fix for gitlab:gitlab_shell:check
2013-02-12 22:17:24 -08:00
Martin Bastien
8353bd8ee3
Forgot gitlab-shell folder
2013-02-12 12:49:11 -05:00
Martin Bastien
6b96ca47e0
Some fix for gitlab:gitlab_shell:check
...
Fixing issue #2970
2013-02-12 12:42:36 -05:00
Dmitriy Zaporozhets
37a5ac4271
Merge pull request #2969 from zerustech/patch-1
...
Update lib/tasks/sidekiq.rake
2013-02-12 09:25:53 -08:00
Dmitriy Zaporozhets
8f9c01feed
Merge pull request #2946 from Asquera/fix/access_to_non_existent_branch
...
API: Fixes return code when accessing non existent branch (#2922 )
2013-02-12 09:24:54 -08:00
Dmitriy Zaporozhets
452adb7bcc
Merge branch 'hiroponz-easy-to-find-commit-on-network-graph'
2013-02-12 19:22:49 +02:00
Dmitriy Zaporozhets
622dae76cc
style network graph form a bit
2013-02-12 19:22:40 +02:00
Dmitriy Zaporozhets
ddea7d1689
Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph
2013-02-12 19:02:05 +02:00
Dmitriy Zaporozhets
d6513b5153
Merge pull request #2924 from cdawzrd/patch-2
...
Disable autocomplete for admin/users form
2013-02-12 08:45:07 -08:00
Michael Lee
4c0c908655
Update lib/tasks/sidekiq.rake
...
Mac OS uses launchd instead of /etc/init.d to start daemons and tasks to be started by launchd MUST NOT daemon itself. So "nohup" here won't work for Mac OS.
Can we add a "launchd" task to the rake file so that we can start sidekiq as "bundle exec rake sidekiq:launchd" ?
2013-02-12 23:01:55 +08:00
Dmitriy Zaporozhets
06dd530ede
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
2013-02-12 10:53:51 +00:00
Dmitriy Zaporozhets
9f2041ad0e
Merge pull request #2965 from yurifury/fix-blob-route
...
Gitlab incorrectly routes blobs to the compare controller depending on filename.
2013-02-12 01:50:03 -08:00
Dmitriy Zaporozhets
bf908989d0
Merge branch 'Undev-fix-db-after-updating-rails'
2013-02-12 11:47:02 +02:00
Dmitriy Zaporozhets
806b76a168
rename scope to prevent name collision
2013-02-12 11:46:50 +02:00