OSDN Git Service
Dmitriy Zaporozhets [Wed, 11 Dec 2013 17:30:49 +0000 (17:30 +0000)]
Merge branch 'bug/at_disappear' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 11 Dec 2013 16:17:08 +0000 (18:17 +0200)]
Fix disappearing @ when mention user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 11 Dec 2013 16:02:14 +0000 (16:02 +0000)]
Merge branch 'improve/avatar_size' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 11 Dec 2013 15:59:37 +0000 (17:59 +0200)]
Add DELETE to api cors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 11 Dec 2013 15:43:21 +0000 (07:43 -0800)]
Merge pull request #5759 from bke-drewb/issue-5496
Add cache expiry on avatar creation/removal
Drew Blessing [Wed, 11 Dec 2013 15:30:22 +0000 (09:30 -0600)]
Expire event cache on avatar creation/removal
Dmitriy Zaporozhets [Wed, 11 Dec 2013 14:34:10 +0000 (14:34 +0000)]
Update deploy.sh script with assets commands
Dmitriy Zaporozhets [Wed, 11 Dec 2013 14:09:23 +0000 (16:09 +0200)]
Dashboard avatars: No need to load 40px images if we render them in 24px
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 11 Dec 2013 09:36:28 +0000 (09:36 +0000)]
Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 11 Dec 2013 07:29:12 +0000 (23:29 -0800)]
Merge pull request #5819 from jvanbaarsen/rails4
Fixed all the confirm: deprecation warnings
Dmitriy Zaporozhets [Wed, 11 Dec 2013 07:19:36 +0000 (09:19 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Wed, 11 Dec 2013 07:18:40 +0000 (07:18 +0000)]
Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Tue, 10 Dec 2013 19:33:21 +0000 (20:33 +0100)]
Fixed all the confirm: deprecation warnings
Dmitriy Zaporozhets [Tue, 10 Dec 2013 15:07:46 +0000 (17:07 +0200)]
Virtus to version 1.0.1. Bye-bye backports
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 14:03:24 +0000 (16:03 +0200)]
Update jasmine gem to work with rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 13:43:27 +0000 (15:43 +0200)]
fix observer specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 12:15:08 +0000 (14:15 +0200)]
Add require for Files contexts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Tue, 10 Dec 2013 12:09:50 +0000 (04:09 -0800)]
Merge pull request #5801 from Rovanion/default-doc
Added example defaults file and appropriate documentation.
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:48:00 +0000 (13:48 +0200)]
Even more data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:46:50 +0000 (13:46 +0200)]
More data: confirm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:41:38 +0000 (13:41 +0200)]
Fix project models specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:38:31 +0000 (13:38 +0200)]
Fix markdown helper spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:35:10 +0000 (13:35 +0200)]
Fix signup for rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:24:48 +0000 (13:24 +0200)]
Fix UserProject obserse spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:20:54 +0000 (13:20 +0200)]
Fix more confirm deprecations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 11:20:35 +0000 (13:20 +0200)]
Fix User#by_username_or_id for postgres
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 10:08:40 +0000 (12:08 +0200)]
Remove some deprecations and fir project helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 08:35:54 +0000 (10:35 +0200)]
Fix wiki editing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 08:35:39 +0000 (10:35 +0200)]
Fix commits atom feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 08:20:31 +0000 (10:20 +0200)]
fix profile tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Mon, 9 Dec 2013 21:36:45 +0000 (22:36 +0100)]
Fixed some deprecations
* Model.all is deprecacted, use without .all
* confirm: message is deprecated, needed to be wrapped
in data block
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:31:25 +0000 (23:31 +0200)]
Mention assets precompile in installation docs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:26:09 +0000 (23:26 +0200)]
GitLab app is not threadsafe so better disable allow_concurrency for production env
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:17:03 +0000 (23:17 +0200)]
Fixed mistake and mock warning
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 21:03:14 +0000 (23:03 +0200)]
Add rails4 to travis
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Mon, 9 Dec 2013 20:51:01 +0000 (21:51 +0100)]
Fixed rails 4 deprecation warnings in groups
Jeroen van Baarsen [Mon, 9 Dec 2013 19:50:36 +0000 (20:50 +0100)]
Upgraded the grape gem
Jeroen van Baarsen [Mon, 9 Dec 2013 19:02:36 +0000 (20:02 +0100)]
Fixed the last deprecation warnings for order and where
Jeroen van Baarsen [Mon, 9 Dec 2013 18:29:39 +0000 (19:29 +0100)]
Fixed some deprecation warnings
Jeroen van Baarsen [Mon, 9 Dec 2013 17:40:55 +0000 (18:40 +0100)]
Fixed default scope deprecation warning
Jeroen van Baarsen [Mon, 9 Dec 2013 17:39:30 +0000 (18:39 +0100)]
Fixed the WhiningNill deprecation fix
Dmitriy Zaporozhets [Fri, 6 Dec 2013 16:20:17 +0000 (18:20 +0200)]
Make User#accessible_deploy_keys works in rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 15:40:39 +0000 (17:40 +0200)]
Require rspec expectations into spinach
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 15:05:59 +0000 (17:05 +0200)]
Fix project lookup for git over http + rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 15:05:34 +0000 (17:05 +0200)]
Added allow_blank to model validations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 15:04:50 +0000 (17:04 +0200)]
Use gems that works with rails 4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 15:04:18 +0000 (17:04 +0200)]
Update config/* to rails4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 08:08:44 +0000 (10:08 +0200)]
Use real gems
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 5 Dec 2013 14:26:34 +0000 (16:26 +0200)]
Migrate application to rails 4 step 1
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 5 Dec 2013 14:26:11 +0000 (16:26 +0200)]
Rails 4 and other gems update
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 10 Dec 2013 10:09:18 +0000 (12:09 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 10 Dec 2013 10:02:57 +0000 (10:02 +0000)]
Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 10 Dec 2013 09:47:35 +0000 (01:47 -0800)]
Merge pull request #5779 from jvanbaarsen/patch-1
Better warning when deleting a user
Dmitriy Zaporozhets [Tue, 10 Dec 2013 09:46:06 +0000 (01:46 -0800)]
Merge pull request #5781 from Rovanion/patch-5
Git clone now gets the right branch from the getgo
Dmitriy Zaporozhets [Tue, 10 Dec 2013 09:45:10 +0000 (01:45 -0800)]
Merge pull request #5794 from maltefiala/master
Added Rake:Attack cp information to Upgrade Guide 6.3.0
Dmitriy Zaporozhets [Tue, 10 Dec 2013 09:43:38 +0000 (01:43 -0800)]
Merge pull request #5798 from criteo/skip_confirmation
Skip email confirmation with LDAP
Rovanion Luckey [Tue, 10 Dec 2013 09:22:22 +0000 (10:22 +0100)]
installation.md - Fixed typo
Dmitriy Zaporozhets [Mon, 9 Dec 2013 19:01:42 +0000 (19:01 +0000)]
Merge branch 'installation-link' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Dec 2013 19:01:10 +0000 (19:01 +0000)]
Merge branch 'feature/gitlab_shell_path' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Dec 2013 18:13:08 +0000 (20:13 +0200)]
Use antialiased font-smoothing for webkit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 17:54:54 +0000 (17:54 +0000)]
Merge branch 'feature/api_version_admin' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Dec 2013 17:54:45 +0000 (17:54 +0000)]
Merge branch 'bug/duplicates_in_search' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Dec 2013 17:54:37 +0000 (17:54 +0000)]
Merge branch 'feature/no_reply' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Dec 2013 17:32:37 +0000 (19:32 +0200)]
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>
dosire [Mon, 9 Dec 2013 16:50:30 +0000 (17:50 +0100)]
Installation should be a paragraph since it is deep linked from everywhere.
Dmitriy Zaporozhets [Mon, 9 Dec 2013 14:36:21 +0000 (16:36 +0200)]
Set noreply@HOSTNAME for reply_to field in all emails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 14:26:43 +0000 (16:26 +0200)]
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>
Dmitriy Zaporozhets [Mon, 9 Dec 2013 14:00:06 +0000 (16:00 +0200)]
Show GitLab API version on Admin#dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Mon, 9 Dec 2013 13:34:26 +0000 (05:34 -0800)]
Merge pull request #5548 from CromFr/master
Fixed comments for running gitlab in a non-root path
Sytse Sijbrandij [Mon, 9 Dec 2013 13:25:59 +0000 (05:25 -0800)]
Merge pull request #5483 from e1himself/patch-1
Fix Markdown help page: escape file link syntax example to leave it unprocessed
Crom (Thibaut CHARLES) [Mon, 9 Dec 2013 13:22:22 +0000 (13:22 +0000)]
Merge branch 'master' of https://github.com/gitlabhq/gitlabhq
Conflicts:
config/application.rb
config/gitlab.yml.example
config/unicorn.rb.example
Rovanion Luckey [Mon, 9 Dec 2013 13:17:33 +0000 (14:17 +0100)]
Fixed security issue.
Rovanion Luckey [Mon, 9 Dec 2013 13:05:50 +0000 (14:05 +0100)]
Added example defaults file and appropriate documentation.
Dmitriy Zaporozhets [Mon, 9 Dec 2013 10:39:41 +0000 (12:39 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 9 Dec 2013 10:38:46 +0000 (10:38 +0000)]
Merge branch 'users_group_observer' of /home/git/repositories/gitlab/gitlabhq
Maxime Brugidou [Mon, 9 Dec 2013 10:06:12 +0000 (11:06 +0100)]
Skip email confirmation with LDAP
Jacob Vosmaer [Mon, 9 Dec 2013 08:29:18 +0000 (00:29 -0800)]
Merge pull request #5471 from dex4er/feature_etc_default_gitlab
Read configuration variable file (/etc/default/gitlab) if it is present
Jacob Vosmaer [Fri, 6 Dec 2013 12:20:35 +0000 (13:20 +0100)]
Avoid duplicate group membership emails
dosire [Mon, 9 Dec 2013 08:02:35 +0000 (09:02 +0100)]
The comments make it hard to copy paste commands. If you paste the whole line it fails.
maltefiala [Sun, 8 Dec 2013 16:45:56 +0000 (17:45 +0100)]
Added Rake:Attack cp information to Upgrade Guide 6.3.0
Sytse Sijbrandij [Sat, 7 Dec 2013 19:54:08 +0000 (11:54 -0800)]
Merge pull request #5791 from mmoll/typo
fix typo: enthousiast -> enthusiast
Michael Moll [Sat, 7 Dec 2013 17:03:02 +0000 (18:03 +0100)]
fix typo: enthousiast -> enthusiast
Dmitriy Zaporozhets [Sat, 7 Dec 2013 16:56:20 +0000 (16:56 +0000)]
Merge branch 'add-book' of /home/git/repositories/gitlab/gitlabhq
dosire [Sat, 7 Dec 2013 16:15:11 +0000 (17:15 +0100)]
Mention enterprise edition and the book, also some cleanup.
Rovanion Luckey [Fri, 6 Dec 2013 20:21:59 +0000 (21:21 +0100)]
Git clone now gets the right branch from the getgo
Simplified the instructions by two steps.
Dmitriy Zaporozhets [Fri, 6 Dec 2013 20:20:11 +0000 (22:20 +0200)]
Show rails version in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 20:14:55 +0000 (22:14 +0200)]
Remove colors from icon helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 6 Dec 2013 20:03:50 +0000 (20:03 +0000)]
Merge branch 'update-patch-guide' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Fri, 6 Dec 2013 19:11:14 +0000 (20:11 +0100)]
Better warning when deleting a user
Warn the administrator better when deleting a user.
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
Dmitriy Zaporozhets [Fri, 6 Dec 2013 14:55:46 +0000 (14:55 +0000)]
Merge branch 'feature/api_cors' of /home/git/repositories/gitlab/gitlabhq
dosire [Fri, 6 Dec 2013 10:21:33 +0000 (11:21 +0100)]
Make everygreen.
dosire [Fri, 6 Dec 2013 08:17:19 +0000 (09:17 +0100)]
Update universal guide.
Dmitriy Zaporozhets [Fri, 6 Dec 2013 07:52:16 +0000 (07:52 +0000)]
Merge branch 'feature/project_visibility_filter' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 5 Dec 2013 18:26:21 +0000 (20:26 +0200)]
Add visibility filter to Dashboard#projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 5 Dec 2013 15:16:45 +0000 (07:16 -0800)]
Merge pull request #5752 from jhollingsworth/fix/no-404-for-project
Fix 404 on project page for unauthenticated user
Dmitriy Zaporozhets [Thu, 5 Dec 2013 09:55:07 +0000 (11:55 +0200)]
Fix comment form UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 5 Dec 2013 09:26:55 +0000 (11:26 +0200)]
Improve avatar block UI on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 5 Dec 2013 08:35:04 +0000 (00:35 -0800)]
Merge pull request #5762 from jvanbaarsen/patch-2
Updated README.md - Added RAILS_ENV
Dmitriy Zaporozhets [Thu, 5 Dec 2013 08:29:45 +0000 (10:29 +0200)]
Allow Cross-origin resource sharing for GitLab API
It will allow to write web applications on other domains to interact
with GitLab instances
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Thu, 5 Dec 2013 08:29:44 +0000 (09:29 +0100)]
Updated README.md - Added RAILS_ENV
Added RAILS_ENV to gitlab:test command, so the dev database wont be wiped.
fixes https://github.com/gitlabhq/gitlabhq/issues/5756#issuecomment-
29876630
OSDN Git Service
