OSDN Git Service
Dmitriy Zaporozhets [Thu, 28 Feb 2013 15:02:20 +0000 (17:02 +0200)]
Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
Conflicts:
Gemfile.lock
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:43:15 +0000 (16:43 +0200)]
Merge branch 'features/text_mail_templates'
Thomas Berger [Fri, 11 Jan 2013 16:53:30 +0000 (17:53 +0100)]
added text-templates for mail notification
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:36:11 +0000 (06:36 -0800)]
Merge pull request #3103 from ezkl/binding-of-caller-bump
Update binding_of_caller to v0.7.1
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:21:58 +0000 (16:21 +0200)]
add description what is gitlab-shell
Dmitriy Zaporozhets [Thu, 28 Feb 2013 14:13:24 +0000 (16:13 +0200)]
Add instruction to edit gitlab-shell config
Andrew8xx8 [Thu, 28 Feb 2013 12:30:47 +0000 (16:30 +0400)]
DB schema updated
Andrew8xx8 [Tue, 19 Feb 2013 13:31:45 +0000 (17:31 +0400)]
Show Issues tracker select only if one or more remote issue trackers available
Andrew8xx8 [Tue, 19 Feb 2013 13:21:59 +0000 (17:21 +0400)]
Issue helper tests improved
Andrew8xx8 [Tue, 19 Feb 2013 13:06:40 +0000 (17:06 +0400)]
Issues link from project page follows on remote bug tracker if it selected now
Andrew8xx8 [Tue, 19 Feb 2013 12:43:24 +0000 (16:43 +0400)]
Issues tracker settings enableds/disableds without page reloading now
Andrew8xx8 [Tue, 19 Feb 2013 12:37:43 +0000 (16:37 +0400)]
Default issue tracker name added to gon variables
Andrew8xx8 [Tue, 19 Feb 2013 12:30:37 +0000 (16:30 +0400)]
Gem gon added. It produces server-side variable values in javascript
Andrew8xx8 [Thu, 14 Feb 2013 14:43:06 +0000 (18:43 +0400)]
Section name returned back to base
Andrew8xx8 [Thu, 14 Feb 2013 14:26:50 +0000 (18:26 +0400)]
Default value for issues_tracker setting added
Andrew8xx8 [Thu, 14 Feb 2013 14:25:56 +0000 (18:25 +0400)]
Wrong default section in config. Fixed.
Andrew8xx8 [Tue, 12 Feb 2013 11:37:33 +0000 (15:37 +0400)]
Issues helper included to markdown helper
Andrew8xx8 [Mon, 11 Feb 2013 13:32:29 +0000 (17:32 +0400)]
Issues helper improved
Andrew8xx8 [Mon, 11 Feb 2013 14:21:04 +0000 (18:21 +0400)]
Migration added
Andrew8xx8 [Mon, 11 Feb 2013 14:17:43 +0000 (18:17 +0400)]
New field added
Andrew8xx8 [Mon, 11 Feb 2013 13:15:10 +0000 (17:15 +0400)]
External issue tracker params added to config
Andrew8xx8 [Mon, 11 Feb 2013 11:41:12 +0000 (15:41 +0400)]
Project issue tracker functions refactored
Andrew8xx8 [Fri, 8 Feb 2013 13:55:02 +0000 (17:55 +0400)]
Issue tracker added to edit project form in admin area
Andrew8xx8 [Wed, 23 Jan 2013 14:13:28 +0000 (18:13 +0400)]
Issue tracker field added to projects
Andrew8xx8 [Fri, 8 Feb 2013 12:47:24 +0000 (16:47 +0400)]
Enumerize gem added
Dmitriy Zaporozhets [Thu, 28 Feb 2013 10:08:25 +0000 (12:08 +0200)]
remove unnecessary center tag in devise layout
Dmitriy Zaporozhets [Thu, 28 Feb 2013 09:06:52 +0000 (11:06 +0200)]
Restyle flash message. Not it does not overflow head panel
Dmitriy Zaporozhets [Thu, 28 Feb 2013 07:43:48 +0000 (09:43 +0200)]
refactor finders in spianch:merge_request.feature
Dmitriy Zaporozhets [Thu, 28 Feb 2013 07:25:23 +0000 (09:25 +0200)]
Commenting a failing test
Dmitriy Zaporozhets [Thu, 28 Feb 2013 07:11:06 +0000 (23:11 -0800)]
Merge pull request #3104 from gitlabhq/contributing-file
Update contributing file with latest insights.
Sytse Sijbrandij [Wed, 27 Feb 2013 21:17:46 +0000 (22:17 +0100)]
Link to new contributing file and the requirements doc.
Sytse Sijbrandij [Wed, 27 Feb 2013 20:51:46 +0000 (21:51 +0100)]
Update contributing file with latest insights.
Ezekiel Templin [Wed, 27 Feb 2013 19:28:36 +0000 (14:28 -0500)]
Update `binding_of_caller` version
Updating this dependency fixed my Ruby 2.0 installation issues.
Dmitriy Zaporozhets [Wed, 27 Feb 2013 19:10:23 +0000 (21:10 +0200)]
reduce fonts size for wiki render
Dmitriy Zaporozhets [Wed, 27 Feb 2013 19:05:57 +0000 (21:05 +0200)]
trying new readme
Dmitriy Zaporozhets [Wed, 27 Feb 2013 18:52:42 +0000 (10:52 -0800)]
Merge pull request #3098 from Undev/important-migrations-fix
IMPORTANT! Data converting in migrations was wrong. Fixed
Dmitriy Zaporozhets [Wed, 27 Feb 2013 18:48:14 +0000 (10:48 -0800)]
Merge pull request #3101 from tsl0922/master
Fix project transfer error
Dmitriy Zaporozhets [Wed, 27 Feb 2013 18:40:01 +0000 (20:40 +0200)]
use system call to start sidekiq
Dmitriy Zaporozhets [Wed, 27 Feb 2013 18:20:31 +0000 (20:20 +0200)]
Developers can merge MR if target branch is not protected
Dmitriy Zaporozhets [Wed, 27 Feb 2013 16:09:48 +0000 (18:09 +0200)]
Update README
Dmitriy Zaporozhets [Wed, 27 Feb 2013 15:48:51 +0000 (17:48 +0200)]
Prevent duplicate merge events
Nihad Abbasov [Wed, 27 Feb 2013 14:47:04 +0000 (06:47 -0800)]
proper fix for #2300
Nihad Abbasov [Wed, 27 Feb 2013 14:06:02 +0000 (06:06 -0800)]
Merge pull request #3095 from fdiary/update-grape-for-ruby2.0
update grape to 0.3.1 for ruby 2.0 support.
Nihad Abbasov [Wed, 27 Feb 2013 14:00:33 +0000 (06:00 -0800)]
API: fix commits pagination
closes #2300
tsl0922 [Wed, 27 Feb 2013 10:27:10 +0000 (18:27 +0800)]
Fix project transfer error
Andrew8xx8 [Wed, 27 Feb 2013 08:53:36 +0000 (12:53 +0400)]
Data converting migrations was wrong. Fixed
Dmitriy Zaporozhets [Wed, 27 Feb 2013 06:24:12 +0000 (08:24 +0200)]
fixed popen test
Dmitriy Zaporozhets [Tue, 26 Feb 2013 21:14:32 +0000 (23:14 +0200)]
move transfer logic out of project to service
Dmitriy Zaporozhets [Tue, 26 Feb 2013 21:04:14 +0000 (23:04 +0200)]
Fix TestHookContext
Dmitriy Zaporozhets [Tue, 26 Feb 2013 20:53:59 +0000 (22:53 +0200)]
specs for api/internal
Dmitriy Zaporozhets [Tue, 26 Feb 2013 20:53:46 +0000 (22:53 +0200)]
specs for Gitlab::Popen
Kazuhiko [Tue, 26 Feb 2013 20:31:45 +0000 (21:31 +0100)]
update grape to 0.3.1 for ruby 2.0 support.
add grape-entity, that is split from grape 0.3.0.
remove usage of deprecated error_format, that is removed in grape 0.2.3.
Dmitriy Zaporozhets [Tue, 26 Feb 2013 09:17:02 +0000 (11:17 +0200)]
remove tests for unexisting methods
Dmitriy Zaporozhets [Tue, 26 Feb 2013 09:11:43 +0000 (11:11 +0200)]
remove unused code related to gitolite
Dmitriy Zaporozhets [Tue, 26 Feb 2013 09:09:32 +0000 (11:09 +0200)]
email validation added
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:48:30 +0000 (10:48 +0200)]
Merge branch 'Undev-state-machine-stage-2'
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:47:27 +0000 (10:47 +0200)]
Fix automerge detection client-side since #3056
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:38:40 +0000 (10:38 +0200)]
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
Conflicts:
app/models/merge_request.rb
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:32:02 +0000 (00:32 -0800)]
Merge pull request #2889 from kennytm/master
Show only ≤16 lines of codes in a discussion in a MR (issue #2860).
Dmitriy Zaporozhets [Tue, 26 Feb 2013 08:17:09 +0000 (10:17 +0200)]
Fix issue edit button showup
Dmitriy Zaporozhets [Mon, 25 Feb 2013 21:16:34 +0000 (23:16 +0200)]
Fixing tests
Dmitriy Zaporozhets [Mon, 25 Feb 2013 21:10:50 +0000 (23:10 +0200)]
Add close issue to note actions bar
Dmitriy Zaporozhets [Mon, 25 Feb 2013 20:56:10 +0000 (22:56 +0200)]
proper name for issue partial
Dmitriy Zaporozhets [Mon, 25 Feb 2013 20:51:15 +0000 (22:51 +0200)]
Sanitize user profile input
Dmitriy Zaporozhets [Mon, 25 Feb 2013 20:12:11 +0000 (22:12 +0200)]
Since search_autocomplete_source rendered with raw all human input should be sanitized to prevent XSS
Dmitriy Zaporozhets [Mon, 25 Feb 2013 19:45:33 +0000 (21:45 +0200)]
Remove gitolite mention from docs
Dmitriy Zaporozhets [Mon, 25 Feb 2013 19:26:15 +0000 (21:26 +0200)]
correct indentation in activity observer
Dmitriy Zaporozhets [Mon, 25 Feb 2013 19:21:38 +0000 (21:21 +0200)]
Move git post push logic to service
Dmitriy Zaporozhets [Mon, 25 Feb 2013 18:15:23 +0000 (10:15 -0800)]
Merge pull request #3052 from Undev/system-hook-observer-improves
System hooks code & logic refactoring
Dmitriy Zaporozhets [Mon, 25 Feb 2013 18:11:52 +0000 (10:11 -0800)]
Merge pull request #3057 from axilleas/master
Remove function 'check_issue_1059_shell_profile_error' from check.rake as it is not needed anymore
Dmitriy Zaporozhets [Mon, 25 Feb 2013 17:44:37 +0000 (19:44 +0200)]
Update grit to handle symlinks
Dmitriy Zaporozhets [Mon, 25 Feb 2013 17:22:46 +0000 (19:22 +0200)]
Update grit for ruby 2.0 support
Dmitriy Zaporozhets [Mon, 25 Feb 2013 08:28:59 +0000 (10:28 +0200)]
remove duplicate finder in features/steps/path
Dmitriy Zaporozhets [Mon, 25 Feb 2013 06:53:49 +0000 (08:53 +0200)]
Fix merge request migration for postgres
Dmitriy Zaporozhets [Sun, 24 Feb 2013 12:13:15 +0000 (04:13 -0800)]
Merge pull request #3071 from dmedvinsky/fix-webhook-auth
Fix WebHook and special symbols in credentials
Dmitriy Zaporozhets [Sun, 24 Feb 2013 12:04:58 +0000 (04:04 -0800)]
Merge pull request #3072 from dmedvinsky/add-title-remove-member
Add title for "Remove from team" button
Dmitriy Zaporozhets [Sun, 24 Feb 2013 12:03:16 +0000 (04:03 -0800)]
Merge pull request #3073 from dmedvinsky/cosmetic-search-transition
Add transition on search box
Dmitry Medvinsky [Fri, 22 Feb 2013 16:50:17 +0000 (20:50 +0400)]
Add transition on search box
It's kind of cool trend to use animated-expanding search box nowadays.
E.g. see Github.
Dmitry Medvinsky [Fri, 22 Feb 2013 16:26:33 +0000 (20:26 +0400)]
Add title for "Remove from team" button
Dmitry Medvinsky [Fri, 22 Feb 2013 16:03:59 +0000 (20:03 +0400)]
Fix WebHook and special symbols in credentials
When using web hook with credentials secured web resource, one needs to
put the credentials in the hook URL.
If the credentials contain special symbols (e.g. @ or #), it should be
URL-quoted (e.g. %40 instead of @).
But when Gitlab is making a request, it should unquote the symbols
before base64-encoding them.
Dmitriy Zaporozhets [Thu, 21 Feb 2013 15:01:02 +0000 (17:01 +0200)]
Add new entries to CHANGELOG
Dmitriy Zaporozhets [Thu, 21 Feb 2013 14:26:09 +0000 (16:26 +0200)]
Restore old order for MR lists. Fix failing tests
Dmitriy Zaporozhets [Thu, 21 Feb 2013 12:11:24 +0000 (14:11 +0200)]
Fix merge request closed filter. Fixed one more test
Dmitriy Zaporozhets [Thu, 21 Feb 2013 12:11:04 +0000 (14:11 +0200)]
Update database cleaner. Remove postgres from travis build list since it gives us deadlocks always
Dmitriy Zaporozhets [Thu, 21 Feb 2013 11:28:05 +0000 (13:28 +0200)]
Removing ambiguity and non-working selectors
Dmitriy Zaporozhets [Thu, 21 Feb 2013 11:09:47 +0000 (13:09 +0200)]
Fixing rspec after upgrade to capybara pt1
Dmitriy Zaporozhets [Thu, 21 Feb 2013 10:39:09 +0000 (12:39 +0200)]
Fix ambiguity for member link in test
Dmitriy Zaporozhets [Thu, 21 Feb 2013 10:27:52 +0000 (12:27 +0200)]
Team features are green now
Andrew8xx8 [Thu, 21 Feb 2013 10:04:06 +0000 (14:04 +0400)]
An Id must be sended to queue
Dmitriy Zaporozhets [Thu, 21 Feb 2013 09:44:33 +0000 (11:44 +0200)]
Monkeypatch satellite call for merge request in tests
Dmitriy Zaporozhets [Thu, 21 Feb 2013 09:27:22 +0000 (11:27 +0200)]
improve selectors to pass capybara 2.0
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:41:37 +0000 (10:41 +0200)]
move capybara scenarios to spec/features
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:41:13 +0000 (10:41 +0200)]
Add LoginHelpers to feature type
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:28:13 +0000 (10:28 +0200)]
Update capybara, poltergeist, spinach, rspec-rails
Dmitriy Zaporozhets [Thu, 21 Feb 2013 08:00:18 +0000 (10:00 +0200)]
Update sidekiq
Dmitriy Zaporozhets [Thu, 21 Feb 2013 07:25:07 +0000 (09:25 +0200)]
Fix merge state detection
Axilleas Pipinellis [Wed, 20 Feb 2013 15:36:09 +0000 (17:36 +0200)]
We don't need to check .profile now that gitolite is replaced by gitlab-shell
Andrew8xx8 [Wed, 20 Feb 2013 13:45:29 +0000 (17:45 +0400)]
human_merge_status replaced by human_merge_status_name
Andrew8xx8 [Wed, 20 Feb 2013 13:37:20 +0000 (17:37 +0400)]
class.self methods moved to scopes
Andrew8xx8 [Wed, 20 Feb 2013 13:15:01 +0000 (17:15 +0400)]
State machine added for merge_status field