OSDN Git Service
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
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
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
Dmitriy Zaporozhets [Thu, 5 Dec 2013 08:11:28 +0000 (00:11 -0800)]
Merge pull request #5761 from gravis/patch-2
Tiny typo
Philippe Lafoucrière [Thu, 5 Dec 2013 07:30:30 +0000 (08:30 +0100)]
Tiny typo
Jason Hollingsworth [Tue, 3 Dec 2013 14:22:33 +0000 (08:22 -0600)]
Fix 404 on project page for unauthenticated user
Eliminate a 404 error when user is not logged in and attempts to visit
a project page.
The 404 page will still show up when user is logged in and the project
doesn’t exist or the user doesn’t have access.
Dmitriy Zaporozhets [Wed, 4 Dec 2013 14:56:19 +0000 (14:56 +0000)]
Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 4 Dec 2013 13:42:06 +0000 (13:42 +0000)]
Merge branch 'feature/event_hooks' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:56:12 +0000 (13:56 +0200)]
Update devise to latest version of 2.2.x
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:35:38 +0000 (13:35 +0200)]
ProjectHook API supports new event fields
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:20:16 +0000 (13:20 +0200)]
Extract tests for project hooks API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:19:53 +0000 (13:19 +0200)]
Expose ProjectHook attributes via API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:02:16 +0000 (13:02 +0200)]
Mention advanced project hooks in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 19:59:06 +0000 (21:59 +0200)]
Improve help page for Project web hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 17:25:16 +0000 (19:25 +0200)]
Update WebHook help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 17:11:10 +0000 (19:11 +0200)]
Annotate web_hooks table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 10:08:00 +0000 (12:08 +0200)]
Modify test to pass new project hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 09:34:06 +0000 (11:34 +0200)]
Execute project hooks when issue or merge request created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 09:31:56 +0000 (11:31 +0200)]
Prepare ProjectHooks to work with issues and merge_requests
* Add event scopes to ProjectHook
* Added Issuable#to_hook_data
* Project#execute_hooks now accept hook filter as argument
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 19:38:32 +0000 (21:38 +0200)]
UI with event types for Project WebHooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 19:33:43 +0000 (21:33 +0200)]
Add new fields to web_hooks table.
Next fields were added:
* push_events
* issues_events
* merge_requests_events
Main goal is to create web hooks that can be triggered only for certain
event types. For example you can have separate web hook for push events
and another one for issues.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 10:51:14 +0000 (02:51 -0800)]
Merge pull request #5741 from archiloque/unused_http_url
Unused http_url member in project & gollum_wiki
Dmitriy Zaporozhets [Wed, 4 Dec 2013 10:48:57 +0000 (02:48 -0800)]
Merge pull request #5755 from PlugIN73/patch-1
Fix bug with showing create merge request button
Alexander Vagin [Wed, 4 Dec 2013 08:02:36 +0000 (11:02 +0300)]
Fix bug with showing create merge request button while merge request are disabled in project settings
Dmitriy Zaporozhets [Wed, 4 Dec 2013 07:13:09 +0000 (09:13 +0200)]
Update rails to 3.2.16
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
OSDN Git Service
