OSDN Git Service
randx [Wed, 30 May 2012 16:46:09 +0000 (19:46 +0300)]
Fix MR modal bug
Dmitriy Zaporozhets [Wed, 30 May 2012 07:24:43 +0000 (00:24 -0700)]
Merge pull request #868 from SaitoWu/bugfix/encoding
Bugfix/encoding
Saito [Wed, 30 May 2012 05:40:47 +0000 (13:40 +0800)]
must force_encoding to utf-8 first
Saito [Wed, 30 May 2012 04:11:03 +0000 (12:11 +0800)]
now render the correct authorname and message
Saito [Wed, 30 May 2012 03:56:48 +0000 (11:56 +0800)]
diff now no need to force_encoding to utf8
Saito [Wed, 30 May 2012 03:56:00 +0000 (11:56 +0800)]
remove detect_enoding. detect_encoding means force_encoding to the file.data's encoding, not encoding to utf8. will cause encoding problem.
Saito [Wed, 30 May 2012 03:47:26 +0000 (11:47 +0800)]
fix graph problem if authorname or message isnot utf8 encoding
Saito [Wed, 30 May 2012 03:44:36 +0000 (11:44 +0800)]
solve the binary problem
Dmitriy Zaporozhets [Tue, 29 May 2012 19:59:07 +0000 (12:59 -0700)]
Merge pull request #867 from NARKOZ/refactoring
Refactoring and assets cleanup
Nihad Abbasov [Tue, 29 May 2012 14:16:28 +0000 (19:16 +0500)]
fix deprecation warnings
Nihad Abbasov [Tue, 29 May 2012 13:55:55 +0000 (18:55 +0500)]
fix file extension
[ci skip]
Nihad Abbasov [Tue, 29 May 2012 13:45:18 +0000 (18:45 +0500)]
get rid of unused assets, use gems instead
Nihad Abbasov [Tue, 29 May 2012 12:53:38 +0000 (17:53 +0500)]
move assets from lib directory to vendor
[ci skip]
Nihad Abbasov [Tue, 29 May 2012 12:50:10 +0000 (17:50 +0500)]
use chosen-rails
Nihad Abbasov [Tue, 29 May 2012 12:35:34 +0000 (17:35 +0500)]
use ffaker gem
Nihad Abbasov [Tue, 29 May 2012 12:22:26 +0000 (17:22 +0500)]
cleanup Gemfile
Nihad Abbasov [Tue, 29 May 2012 12:13:41 +0000 (17:13 +0500)]
cleanup User model
Nihad Abbasov [Tue, 29 May 2012 12:11:55 +0000 (17:11 +0500)]
fix typo in spec file name
Dmitriy Zaporozhets [Tue, 29 May 2012 10:25:47 +0000 (03:25 -0700)]
Merge pull request #866 from NARKOZ/travis-ruby193
Travis and Ruby 1.9.3
Saito [Tue, 29 May 2012 08:17:31 +0000 (16:17 +0800)]
monkey patch grit to support utf8 encoding
Saito [Tue, 29 May 2012 08:16:59 +0000 (16:16 +0800)]
rewrite encode strategy.
Nihad Abbasov [Mon, 28 May 2012 21:38:15 +0000 (02:38 +0500)]
fix travis issues and run build against ruby 1.9.3
Nihad Abbasov [Mon, 28 May 2012 21:35:50 +0000 (02:35 +0500)]
use shoulda-matchers instead of shoulda gem
randx [Mon, 28 May 2012 17:19:54 +0000 (20:19 +0300)]
MR: Accept section polished. Show permission info
randx [Sun, 27 May 2012 17:52:40 +0000 (20:52 +0300)]
[Tests] Update team member permission
randx [Sun, 27 May 2012 10:40:43 +0000 (13:40 +0300)]
[Tests] Fixed graph test
randx [Sun, 27 May 2012 10:39:57 +0000 (13:39 +0300)]
[Tests] Better project coverage
randx [Sun, 27 May 2012 10:22:23 +0000 (13:22 +0300)]
[Tests] added spec for search page
randx [Sun, 27 May 2012 09:34:25 +0000 (12:34 +0300)]
Fixed wrong module name
randx [Sun, 27 May 2012 09:20:35 +0000 (12:20 +0300)]
Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding
Conflicts:
lib/gitlab/encode.rb
Gabriel Mazetto [Sun, 27 May 2012 02:19:27 +0000 (23:19 -0300)]
Forgot to refactor a line on lib/gitlabhq/encode.rb
Gabriel Mazetto [Sat, 26 May 2012 23:15:06 +0000 (20:15 -0300)]
Better algorithm to deal with encodings. Moved fallback rescue message from view to encode library.
This helps fix cases where UTF-8 is wrongly identified as ISO-8859-1. We will only try to convert strings if we are 100% sure about the charset, otherwise, we will fallback to UTF-8.
randx [Sat, 26 May 2012 22:09:44 +0000 (01:09 +0300)]
Images refactored, Feed icon replaced, Fixed comment form focus
Gabriel Mazetto [Sat, 26 May 2012 18:27:29 +0000 (15:27 -0300)]
It's dangerous to rescue errors here as it will hide bugs. define_tree_vars already catch all situations where something may not exist.
Gabriel Mazetto [Sat, 26 May 2012 18:22:47 +0000 (15:22 -0300)]
Better fix for encoding problems on rendering of inline file visualizations like README files.
Gabriel Mazetto [Sat, 26 May 2012 18:20:35 +0000 (15:20 -0300)]
Fixed encoding problems with plain/text blobs being sent without charset.
Valeriy Sizov [Sat, 26 May 2012 11:52:59 +0000 (04:52 -0700)]
Merge pull request #862 from hfase01/patch-1
Updated; libreadline-dev > libreadline-gplv2-dev
randx [Sat, 26 May 2012 10:38:07 +0000 (13:38 +0300)]
Merge branch 'lib_refactoring'
randx [Sat, 26 May 2012 10:37:49 +0000 (13:37 +0300)]
lib/ refactoring. Module Gitlabhq renamed to Gitlab
Hans Fase [Sat, 26 May 2012 05:35:50 +0000 (02:35 -0300)]
Updated; libreadline-dev libreadline-gplv2-dev
;) Have fun!
Dmitriy Zaporozhets [Fri, 25 May 2012 13:38:23 +0000 (16:38 +0300)]
[Travis] try run both db
Dmitriy Zaporozhets [Thu, 24 May 2012 06:23:25 +0000 (09:23 +0300)]
Milestone show, Team index: Better UI
Valeriy Sizov [Wed, 23 May 2012 20:20:01 +0000 (13:20 -0700)]
Merge pull request #855 from talltroym/patch-1
Corrected line for running gl-system-install
Troy Murray [Wed, 23 May 2012 18:45:02 +0000 (15:45 -0300)]
Corrected line for running gl-system-install
Dmitriy Zaporozhets [Wed, 23 May 2012 10:19:56 +0000 (03:19 -0700)]
Merge pull request #850 from Skarm/master
fix merge_requests.html.haml
Eric [Wed, 23 May 2012 09:20:41 +0000 (15:20 +0600)]
fix merge_requests.html
Dmitriy Zaporozhets [Wed, 23 May 2012 03:05:07 +0000 (20:05 -0700)]
Merge pull request #849 from SaitoWu/bugfix/css
fix No route matches static.css Error
Saito [Mon, 21 May 2012 04:00:24 +0000 (12:00 +0800)]
fix No route matches static.css Error
Dmitriy Zaporozhets [Tue, 22 May 2012 11:57:04 +0000 (14:57 +0300)]
Prevent app crash in case if encoding failed
Dmitriy Zaporozhets [Mon, 21 May 2012 20:17:41 +0000 (23:17 +0300)]
Gem updates & githost logger
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
Dmitriy Zaporozhets [Sun, 20 May 2012 08:02:14 +0000 (01:02 -0700)]
Merge pull request #837 from avakarev/get-rid-of-ruby-antipattern-unless-else
Refactoring: get rid of ruby antipattern unless/else and use if/else instead
Dmitriy Zaporozhets [Sun, 20 May 2012 08:01:29 +0000 (01:01 -0700)]
Merge pull request #836 from avakarev/cleanup-public-dir
Get rid of useless public/index.html (auto-generated file when new rails app was created)
Andrey Vakarev [Sun, 20 May 2012 00:01:13 +0000 (03:01 +0300)]
Refactoring: get rid of ruby antipattern unless/else and use if/else instead
Andrey Vakarev [Sat, 19 May 2012 23:15:12 +0000 (02:15 +0300)]
Get rid of useless public/index.html (auto-generated file when new rails app was created)
Dmitriy Zaporozhets [Sat, 19 May 2012 10:34:20 +0000 (03:34 -0700)]
Merge pull request #833 from Nek-/patch-utf8
Added force utf8 encoding
Dmitriy Zaporozhets [Sat, 19 May 2012 10:17:34 +0000 (13:17 +0300)]
Preparing to v2.5
Nek [Sat, 19 May 2012 10:12:49 +0000 (12:12 +0200)]
Added force utf8 encoding
Dmitriy Zaporozhets [Sat, 19 May 2012 09:25:16 +0000 (12:25 +0300)]
Event feed: Icons for some events
Dmitriy Zaporozhets [Sat, 19 May 2012 09:00:46 +0000 (12:00 +0300)]
Password & token split up, icon to button for top panel
Dmitriy Zaporozhets [Sat, 19 May 2012 07:35:20 +0000 (00:35 -0700)]
Merge pull request #832 from akzhan/master
Use modified pygments.rb to allow dependency to rubypython 0.6
Akzhan Abdulin [Fri, 18 May 2012 17:44:35 +0000 (19:44 +0200)]
Use modified pygments.rb to allow dependency to rubypython 0.6.1 or above that fixes installation issues on some 64bit OSes like RHEL-based Scientific Linux 6.
Dmitriy Zaporozhets [Thu, 17 May 2012 21:23:18 +0000 (00:23 +0300)]
Branches pages polished. few css improvements
mikkyhouse [Thu, 17 May 2012 16:46:03 +0000 (09:46 -0700)]
Merge pull request #828 from CedricGatay/feature/chosen_0.9.8_searchContains
Chosen 0.9.8 + Autocomplete contains
Cedric Gatay [Thu, 17 May 2012 16:41:15 +0000 (18:41 +0200)]
Chosen 0.9.8 + Autocomplete contains
Bumped Chosen to 0.9.8 (latest) and added default option to allow autocompletes to find items containing entered text.
Dmitriy Zaporozhets [Thu, 17 May 2012 16:11:45 +0000 (19:11 +0300)]
New Feature: Git Blame for file
Dmitriy Zaporozhets [Thu, 17 May 2012 06:34:28 +0000 (23:34 -0700)]
Merge pull request #827 from oreofish/bugfix
fix bug in mailer
RickXing [Thu, 17 May 2012 06:30:24 +0000 (14:30 +0800)]
fix bug in mailer
Dmitriy Zaporozhets [Wed, 16 May 2012 15:27:30 +0000 (08:27 -0700)]
Merge pull request #826 from robbkidd/notify_specs_use_host_from_config
Fix bug: Update Notify spec to use host set in config/gitlab.yml
Robb Kidd [Wed, 16 May 2012 15:25:18 +0000 (11:25 -0400)]
Update Notify spec to use host set in config/gitlab.yml
Fixes failing tests introduced in pull request #824
Dmitriy Zaporozhets [Wed, 16 May 2012 14:45:28 +0000 (07:45 -0700)]
Merge pull request #825 from demelziraptor/master
View project pages without master branch
Demelziraptor [Wed, 16 May 2012 13:34:10 +0000 (14:34 +0100)]
change find_or_first to work with default branch
Dmitriy Zaporozhets [Wed, 16 May 2012 06:36:09 +0000 (23:36 -0700)]
Merge pull request #824 from robbkidd/test_the_mailers
Spec Notify mailers
Robb Kidd [Wed, 16 May 2012 02:27:35 +0000 (22:27 -0400)]
Change calls to Notify methods to send IDs instead of objects.
Robb Kidd [Tue, 15 May 2012 23:41:37 +0000 (19:41 -0400)]
Make Notify#new_merge_request_email resque friendly.
Robb Kidd [Tue, 15 May 2012 23:36:48 +0000 (19:36 -0400)]
Make Notify#new_issue_email resque friendly.
Robb Kidd [Tue, 15 May 2012 23:25:21 +0000 (19:25 -0400)]
Add delegate for project's name on Note.
Robb Kidd [Tue, 15 May 2012 23:21:12 +0000 (19:21 -0400)]
Make Notify#note_wall_email resque friendly
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
Robb Kidd [Tue, 15 May 2012 23:20:15 +0000 (19:20 -0400)]
Make Notify#note_commit_email resque friendly
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
Robb Kidd [Tue, 15 May 2012 22:50:36 +0000 (18:50 -0400)]
Make Notify#note_issue_email resque friendly
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
Robb Kidd [Tue, 15 May 2012 22:48:00 +0000 (18:48 -0400)]
Make Notify#note_merge_request_email resque friendly
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
Robb Kidd [Tue, 15 May 2012 03:42:47 +0000 (23:42 -0400)]
Rename changed_mr_email to reassigned_mr_email & make resque friendly
#changed_merge_request_email was really sending emails about merge
request reassignments. Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
Robb Kidd [Tue, 15 May 2012 03:27:52 +0000 (23:27 -0400)]
Rename changed_issue_email to reassigned_issue_email & make resque friendly
#changed_issue_email was really sending emails about issue reassignments.
Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
Robb Kidd [Tue, 15 May 2012 03:07:36 +0000 (23:07 -0400)]
Update new_user_email to take id for User and perform find itself.
Robb Kidd [Mon, 14 May 2012 22:03:30 +0000 (18:03 -0400)]
Add specs for all of the emails.
Robb Kidd [Mon, 14 May 2012 18:05:32 +0000 (14:05 -0400)]
Add specs for Notify ActionMailer emails.
Covers new user, new issue and wall note emails.
Depends on email_spec (https://github.com/bmabey/email-spec/) for
friendly matchers.
Dmitriy Zaporozhets [Tue, 15 May 2012 16:35:18 +0000 (19:35 +0300)]
CSS improvements for diff & file view
Dmitriy Zaporozhets [Tue, 15 May 2012 15:41:05 +0000 (08:41 -0700)]
Merge pull request #823 from kugaevsky/main_menu_styles
CSS fix: main menu buttons dividers
Nick Kugaevsky [Tue, 15 May 2012 14:50:27 +0000 (18:50 +0400)]
CSS fix: main menu buttons dividers
Dmitriy Zaporozhets [Tue, 15 May 2012 14:13:06 +0000 (07:13 -0700)]
Merge pull request #822 from kugaevsky/activity_stream
Activity stream labels css fix
Nick Kugaevsky [Tue, 15 May 2012 13:47:01 +0000 (17:47 +0400)]
Activity stream: event labels css fix — proper paddings.
Nick Kugaevsky [Tue, 15 May 2012 13:46:18 +0000 (17:46 +0400)]
Activity stream: commit labels css fix — proper paddings and highlighting on hover.
Dmitriy Zaporozhets [Tue, 15 May 2012 08:08:30 +0000 (01:08 -0700)]
Merge pull request #814 from kugaevsky/patch-1
Minor headers styles in readme fix: increased line-height for h1..h4.
Dmitriy Zaporozhets [Tue, 15 May 2012 07:18:49 +0000 (00:18 -0700)]
Merge pull request #821 from oreofish/showmarkdown
show rendered file if it is .markdown file
Dmitriy Zaporozhets [Tue, 15 May 2012 07:17:44 +0000 (00:17 -0700)]
Merge pull request #820 from robbkidd/add_missing_call_to_find
Fix bug: missing call to MergeRequest.find in Notify#changed_merge_request_email
RickXing [Tue, 15 May 2012 01:23:14 +0000 (09:23 +0800)]
show rendered file if it is .markdown file
Robb Kidd [Tue, 15 May 2012 00:19:28 +0000 (20:19 -0400)]
Fix missing call to MergeRequest.find in Notify#changed_merge_request_email
Dmitriy Zaporozhets [Sun, 13 May 2012 15:20:14 +0000 (08:20 -0700)]
Merge pull request #761 from michaeltrimm/patch-1
Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that...
Valeriy Sizov [Sun, 13 May 2012 05:50:57 +0000 (22:50 -0700)]
Merge pull request #812 from bgondy/patch-1
Adding sudo before sudo rm -rf /tmp/gitolite-admin (privileges needed)
Dmitriy Zaporozhets [Sat, 12 May 2012 18:31:12 +0000 (11:31 -0700)]
Merge pull request #809 from robbkidd/spec_protected_branch
Add spec for ProtectedBranch.
Dmitriy Zaporozhets [Sat, 12 May 2012 18:17:42 +0000 (21:17 +0300)]
Fixed Gemfile.lock