Dmitriy Zaporozhets
49a26eaece
Fix project lookup for git over http + rails4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets
b3c1d0d8df
Added allow_blank to model validations
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets
acbac26a5a
Use gems that works with rails 4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets
ede272406a
Update config/* to rails4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets
f38435b9e7
Use real gems
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-10 12:11:27 +02:00
Dmitriy Zaporozhets
ac5842d970
Migrate application to rails 4 step 1
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-10 12:11:26 +02:00
Dmitriy Zaporozhets
8a54fda459
Rails 4 and other gems update
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-10 12:11:26 +02:00
Dmitriy Zaporozhets
16697f6efa
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-12-10 12:09:18 +02:00
Dmitriy Zaporozhets
6a90378dae
Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhq
2013-12-10 10:02:57 +00:00
Dmitriy Zaporozhets
27900efb97
Merge pull request #5779 from jvanbaarsen/patch-1
...
Better warning when deleting a user
2013-12-10 01:47:35 -08:00
Dmitriy Zaporozhets
2f148190c4
Merge pull request #5781 from Rovanion/patch-5
...
Git clone now gets the right branch from the getgo
2013-12-10 01:46:06 -08:00
Dmitriy Zaporozhets
e796018048
Merge pull request #5794 from maltefiala/master
...
Added Rake:Attack cp information to Upgrade Guide 6.3.0
2013-12-10 01:45:10 -08:00
Dmitriy Zaporozhets
e44653764a
Merge pull request #5798 from criteo/skip_confirmation
...
Skip email confirmation with LDAP
2013-12-10 01:43:38 -08:00
Dmitriy Zaporozhets
1ab91d889d
Merge branch 'installation-link' of /home/git/repositories/gitlab/gitlabhq
2013-12-09 19:01:42 +00:00
Dmitriy Zaporozhets
a7e2c4923d
Merge branch 'feature/gitlab_shell_path' of /home/git/repositories/gitlab/gitlabhq
2013-12-09 19:01:10 +00:00
Dmitriy Zaporozhets
a215dbe43a
Use antialiased font-smoothing for webkit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-09 20:13:08 +02:00
Dmitriy Zaporozhets
bc82b2f803
Merge branch 'feature/api_version_admin' of /home/git/repositories/gitlab/gitlabhq
2013-12-09 17:54:54 +00:00
Dmitriy Zaporozhets
a7e1290a67
Merge branch 'bug/duplicates_in_search' of /home/git/repositories/gitlab/gitlabhq
2013-12-09 17:54:45 +00:00
Dmitriy Zaporozhets
8700e91dab
Merge branch 'feature/no_reply' of /home/git/repositories/gitlab/gitlabhq
2013-12-09 17:54:37 +00:00
Dmitriy Zaporozhets
f1c82bc56c
Add gitlab-shell#path option in config
...
Before this commit gitlab-shell but me placed directly in home dir.
Ex:
/home/git/gitlab-shell
After this change you can place gitlab-shell in custom location.
Ex:
/Users/developer/gitlab/gitlab-shell
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-09 19:32:37 +02:00
dosire
ee4dd77d13
Installation should be a paragraph since it is deep linked from everywhere.
2013-12-09 17:50:30 +01:00
Dmitriy Zaporozhets
ccf2e48a2c
Set noreply@HOSTNAME for reply_to field in all emails
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-09 16:36:21 +02:00
Dmitriy Zaporozhets
954dd39861
Remove duplicate items from search autocomplete
...
Old behaviour gave you duplicate entries if your project is public
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-09 16:26:43 +02:00
Dmitriy Zaporozhets
d0637d63db
Show GitLab API version on Admin#dashboard
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-09 16:00:06 +02:00
Sytse Sijbrandij
c0f6a932b9
Merge pull request #5548 from CromFr/master
...
Fixed comments for running gitlab in a non-root path
2013-12-09 05:34:26 -08:00
Sytse Sijbrandij
96e2113477
Merge pull request #5483 from e1himself/patch-1
...
Fix Markdown help page: escape file link syntax example to leave it unprocessed
2013-12-09 05:25:59 -08:00
Crom (Thibaut CHARLES)
906c65b624
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
...
Conflicts:
config/application.rb
config/gitlab.yml.example
config/unicorn.rb.example
2013-12-09 13:22:22 +00:00
Dmitriy Zaporozhets
dbf8ae7301
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-12-09 12:39:41 +02:00
Dmitriy Zaporozhets
74b720034a
Merge branch 'users_group_observer' of /home/git/repositories/gitlab/gitlabhq
2013-12-09 10:38:46 +00:00
Maxime Brugidou
2c4e3e001f
Skip email confirmation with LDAP
2013-12-09 11:06:12 +01:00
Jacob Vosmaer
31cdb7a405
Merge pull request #5471 from dex4er/feature_etc_default_gitlab
...
Read configuration variable file (/etc/default/gitlab) if it is present
2013-12-09 00:29:18 -08:00
Jacob Vosmaer
1af65c96c9
Avoid duplicate group membership emails
2013-12-09 09:22:59 +01:00
dosire
1661777516
The comments make it hard to copy paste commands. If you paste the whole line it fails.
2013-12-09 09:02:35 +01:00
maltefiala
d80fa8025b
Added Rake:Attack cp information to Upgrade Guide 6.3.0
2013-12-08 17:45:56 +01:00
Sytse Sijbrandij
abf11135c2
Merge pull request #5791 from mmoll/typo
...
fix typo: enthousiast -> enthusiast
2013-12-07 11:54:08 -08:00
Michael Moll
300ddbf45e
fix typo: enthousiast -> enthusiast
2013-12-07 18:03:02 +01:00
Dmitriy Zaporozhets
845b98ec2b
Merge branch 'add-book' of /home/git/repositories/gitlab/gitlabhq
2013-12-07 16:56:20 +00:00
dosire
d514d7abf0
Mention enterprise edition and the book, also some cleanup.
2013-12-07 17:15:11 +01:00
Rovanion Luckey
8583d7d186
Git clone now gets the right branch from the getgo
...
Simplified the instructions by two steps.
2013-12-06 21:21:59 +01:00
Dmitriy Zaporozhets
1dfd585f3e
Show rails version in admin area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-06 22:20:11 +02:00
Dmitriy Zaporozhets
97e05469e2
Remove colors from icon helpers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-06 22:14:55 +02:00
Dmitriy Zaporozhets
a4a27a5a2b
Merge branch 'update-patch-guide' of /home/git/repositories/gitlab/gitlabhq
2013-12-06 20:03:50 +00:00
Jeroen van Baarsen
00d72e73c8
Better warning when deleting a user
...
Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
2013-12-06 20:11:14 +01:00
Dmitriy Zaporozhets
68d9538170
Merge branch 'feature/api_cors' of /home/git/repositories/gitlab/gitlabhq
2013-12-06 14:55:46 +00:00
dosire
bdc745b291
Make everygreen.
2013-12-06 11:21:33 +01:00
dosire
d277bf4bf9
Update universal guide.
2013-12-06 09:17:19 +01:00
Dmitriy Zaporozhets
a2efc277cf
Merge branch 'feature/project_visibility_filter' of /home/git/repositories/gitlab/gitlabhq
2013-12-06 07:52:16 +00:00
Dmitriy Zaporozhets
3b20c89005
Add visibility filter to Dashboard#projects
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-05 20:26:21 +02:00
Dmitriy Zaporozhets
a767c13367
Merge pull request #5752 from jhollingsworth/fix/no-404-for-project
...
Fix 404 on project page for unauthenticated user
2013-12-05 07:16:45 -08:00
Dmitriy Zaporozhets
e5f4c7883f
Fix comment form UI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-12-05 11:55:07 +02:00