Commit Graph
2595 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 419d1eac1f Merge pull request #3903 from frlan/master
A small update of nginx example config to prevent users from issues while nginx not listen on localhost
2013-05-13 08:59:23 -07:00
Sato Hiroyuki c0e3b39792 Set @options in assing_ref_vars
@options enable to keep params when switching ref.
2013-05-13 18:44:33 +09:00
Sato Hiroyuki 97a9c2293a Refactor: remove dup code 2013-05-13 18:41:04 +09:00
Dmitriy Zaporozhets 0a4a6f5921 Merge pull request #3918 from joeandaverde/unsanitized
System calls to gitlab-shell were using unsanitized user input
2013-05-13 02:08:00 -07:00
Joe Andaverde ba21546a58 System calls were using unsanitized user input 2013-05-12 09:11:09 -05:00
baba 320f0ac856 Migrate notes.line_code format.
Since version 4.1, notes.line_code means:
  {SHA1 hash of file path}_{old line}_{new line}
but the older version means:
  {file index of the commit}_{old line}_{new line}

This rake task migrate the above differences.
2013-05-11 16:53:07 +09:00
Frank Lanitz aba29ab94c Adding a short hint to *:80 for default listen address on nginx example config
Based on posting https://github.com/gitlabhq/gitlabhq/issues/3384#issuecomment-15457287 I was able to solved an issue here. Pointing out *:80 might could prevent others for struggeling here
2013-05-10 17:45:02 +02:00
Lyle Entwistle 85e784cc1d Fixed puma.rb environment setting, no need to specify 'production' in daemon options now 2013-05-09 17:41:00 +01:00
Dmitriy Zaporozhets 9fdcdb774f Move blob_snippet to gitlab_git gem 2013-05-09 11:47:09 +03:00
Javier CastroandDmitriy Zaporozhets 7f57fe5034 Implemented code search feature 2013-05-09 11:47:08 +03:00
rezigned 76d958ebe7 Update init.d script
The original init.d script uses a fixed username (e.g. git). Which is not flexible
when we using other user. So, I've updated it to use $APP_USER variable
instead and wrap it in a function to reduce repetitive codes.
2013-05-09 12:37:56 +07:00
Lev AbalkinandAlexander Belopolsky cef76fdd17 Save backup time as is. Fixes #3857. 2013-05-08 16:42:29 -04:00
Sato Hiroyuki 862e0ff6b8 Add Gitlab::VersionInfo class to fix and simplify version check.
It returns "yes" if required version is "1.7.10" and current version is "1.6.10",
because the patch version of current version equals to that of required version.
2013-05-08 17:36:48 +09:00
Dmitriy Zaporozhets 2e9599b746 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-05-07 21:28:16 +03:00
Dmitriy Zaporozhets 03441769df Include default labels in issues autocomplete etc. Show colored labels on issues show page 2013-05-07 19:26:41 +03:00
Dmitriy Zaporozhets be68cc4617 add Gitlab::Label class and different color labels for default labels set 2013-05-07 17:57:59 +03:00
Dmitriy Zaporozhets 635982a87b Merge pull request #3871 from axilleas/backup-fix
Fix errors during backup task. Fix #3785
2013-05-07 07:55:02 -07:00
Dmitriy Zaporozhets af5d0e9e92 Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes
Code cleanup: Replace old hashes and remove trailing spaces
2013-05-07 06:59:03 -07:00
Axilleas Pipinellis 13dcc390cb Fix errors during backup task. Fix #3785
By default there is no public/uploads directory when no attachments
are uploaded. Prompt users to create the uploads directory during
install otherwise the backup task will fail.

Place mysqldump args in single quotes to avoid error if password
contains special characters.

Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
2013-05-07 14:44:49 +03:00
Sato Hiroyuki 3a8ee2291a Fix check git version.
Checking is "yes" only if git version equals "1.7.10" exactly.
2013-05-07 17:12:44 +09:00
Lev Abalkin 7357ebc4a0 Save backup time as is. Fixes #3857. 2013-05-06 19:58:10 -04:00
Nihad Abbasov 77d0e41df0 fix API route to delete project hook 2013-05-07 00:09:23 +05:00
Dmitriy Zaporozhets 4528fa9817 modify api to work with new deploy keys 2013-05-06 16:24:58 +03:00
Dmitriy Zaporozhets ff346c01fa Check git version in gitlab:check 2013-05-06 15:08:53 +03:00
Andrey Kumanyaev b1b354b0f8 remove trailing spaces 2013-05-05 18:02:02 +04:00
Andrey Kumanyaev 67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
majjacz 93dccb7298 Changed forgotten unicorn to puma in the init script 2013-05-04 21:39:53 +02:00
Dmitriy Zaporozhets f40d4e6685 Merge pull request #3597 from amacarthur/fork-pull-request
updated fork feature to use gitlab-shell for v5 of gitlab
2013-05-02 23:41:07 -07:00
tsl0922 f1c9b05868 better fix for encoding error 2013-05-03 11:31:23 +08:00
tsl0922 4e055e8a63 fix: UTF-8 encoding error 2013-05-03 10:58:53 +08:00
tsl0922 ef61d1f200 fix http push 401 2013-05-03 10:58:53 +08:00
Dmitriy Zaporozhets 3f46287842 require gitlab-shell v1.4.0 2013-04-30 14:49:35 +03:00
Dmitriy Zaporozhets 7ec1cfd5f5 Merge pull request #3758 from fredowski/master
Authenticate LDAP users in the grack module - fixed problems - tested code
2013-04-30 03:10:09 -07:00
Dmitriy Zaporozhets 9e13160e64 Merge pull request #3688 from amacarthur/rake-fix
fixed broken gitlab version determination during backup
2013-04-30 01:47:53 -07:00
Friedrich Beckmann 20a88f5c43 LDAP authentication in grack - check ldap conf before call / added comment 2013-04-29 22:26:03 +02:00
Dmitriy Zaporozhets fbb7cd8b76 fix wrong class name 2013-04-29 09:49:25 +03:00
Dmitriy Zaporozhets a1704273ec Refactor post-receive worker 2013-04-29 09:43:18 +03:00
Friedrich Beckmann 228baa80b2 LDAP Authentification with grack for https push - fixed password check 2013-04-27 23:31:48 +02:00
Dmitriy Zaporozhets 4f2d2c90f7 Move Gitlab::Git out of gitlab core 2013-04-27 23:50:17 +03:00
Sato Hiroyuki 05c2c15cd1 Fix Gitlab::Git::Repository#commit returns wrong commit, if commit_id is "tag name". 2013-04-25 20:54:00 +00:00
Angus MacArthur 2ad723e1c1 fixed broken gitlab version determination during backup
If the backup directory is not sub the gitlab install directory,
then the git rev-parse call will fail.
2013-04-23 16:14:13 -04:00
Dmitriy Zaporozhets 5ac5f586f8 Move init.d and nginx default recipes in core library to save efforts trying keep sync between gitlab-recipes and gitlabhq 2013-04-22 12:44:09 +02:00
Dmitriy Zaporozhets 44d63b4cea require gitlab:shell v1.3.0 2013-04-20 15:56:13 +03:00
Dmitriy Zaporozhets ae2f5ecdf7 Add support for git-archive in gitlab internal api 2013-04-20 15:43:48 +03:00
Dmitriy Zaporozhets a769662f18 Invoke shell setup after backup restore 2013-04-18 13:27:52 +03:00
Dmitriy Zaporozhets e79ab4bdb9 Merge pull request #3209 from tsl0922/master
Fix: API 500 error when project does not exists
2013-04-18 03:25:03 -07:00
Dmitriy Zaporozhets bd4057910b Merge pull request #3603 from axilleas/os-name
Added os_name support for systems running systemd.
2013-04-18 03:08:40 -07:00
Dmitriy Zaporozhets 0f758405e0 Merge pull request #3602 from axilleas/check-redis
Added check_redis_version to check.rake
2013-04-18 03:08:07 -07:00
Dmitriy Zaporozhets 85ec345183 Prevent 500 error on git blame if empty file 2013-04-18 12:46:41 +03:00
Dmitriy Zaporozhets 0715abaf24 migrate milestones with nil state 2013-04-16 20:00:30 +03:00