OSDN Git Service
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 [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
Dmitriy Zaporozhets [Sat, 12 May 2012 18:02:13 +0000 (21:02 +0300)]
Merge branch 'resquemailer' of https://github.com/oreofish/gitlabhq into oreofish-resquemailer
Conflicts:
Gemfile.lock
Nick Kugaevsky [Sat, 12 May 2012 12:50:57 +0000 (16:50 +0400)]
Minor headers styles in readme fix: increased line-height for h1..h4.
RickXing [Sat, 12 May 2012 09:01:09 +0000 (17:01 +0800)]
use resque mailer to send mail background
bgondy [Fri, 11 May 2012 22:42:16 +0000 (01:42 +0300)]
Adding sudo before sudo rm -rf /tmp/gitolite-admin (root privileges needed)
Valeriy Sizov [Fri, 11 May 2012 07:54:51 +0000 (00:54 -0700)]
Merge pull request #807 from robbkidd/update_the_gems
Updated gems. Specs all still pass. (Devise pinned to 1.x)
Valeriy Sizov [Fri, 11 May 2012 07:47:02 +0000 (00:47 -0700)]
Merge pull request #808 from robbkidd/mr_text_column_size_increase_in_schema.rb_too
Add to schema.rb the increased MR text column size.
Robb Kidd [Thu, 10 May 2012 22:43:12 +0000 (22:43 +0000)]
Add spec for ProtectedBranch.
Robb Kidd [Thu, 10 May 2012 21:54:22 +0000 (21:54 +0000)]
Add to schema.rb the increased MR text column size.
This change was made in a migration in commit
17a88bb6a21cc8b6125bd2e36c1f62f4bd13300e.
Because the schema.rb is checked in, the column size increase should
be here, too.
Robb Kidd [Thu, 10 May 2012 21:46:07 +0000 (21:46 +0000)]
Updated gems. Specs all still pass. (Devise pinned to 1.x)
Pinned devise to the 1.x series for the moment. Going to 2.0 threw
deprecation warnings about:
* Devise.stateless_token= (append :token_auth to Devise.skip_session_storage instead)
* devise.registrations.reasons in yml (use devise.registrations.signed_up_but_REASON)
Valeriy Sizov [Thu, 10 May 2012 09:48:43 +0000 (02:48 -0700)]
Merge pull request #800 from zx1986/patch-1
in /etc/init.d/gitlab, I add "-l" option in sh command
張旭 [Wed, 9 May 2012 09:46:42 +0000 (17:46 +0800)]
in /etc/init.d/gitlab, I add "-l" option in sh command
Valeriy Sizov [Mon, 7 May 2012 10:42:33 +0000 (03:42 -0700)]
Merge pull request #794 from SaitoWu/master
update launchy to fix an NoMethodError on development and test mode
Valeriy Sizov [Mon, 7 May 2012 10:15:09 +0000 (13:15 +0300)]
Update .travis.yml
Saito [Mon, 7 May 2012 02:55:57 +0000 (10:55 +0800)]
update launchy to fix an nomethod error on development and test mode
Valeriy Sizov [Fri, 4 May 2012 09:47:19 +0000 (02:47 -0700)]
Merge pull request #785 from prydonius/spelling_mistake
spelling mistake 'successfull'
Adnan Abdulhussein [Thu, 3 May 2012 19:35:15 +0000 (20:35 +0100)]
spelling mistake 'successfull'
Valeriy Sizov [Thu, 3 May 2012 13:19:49 +0000 (06:19 -0700)]
Merge pull request #775 from netdata/gravatar_empty_issue
When the email address is empty gitlab will give a 500 error
Valeriy Sizov [Thu, 3 May 2012 13:17:37 +0000 (06:17 -0700)]
Merge pull request #777 from netdata/Show_better_permissions_overview
Make permission overview structured
Valeriy Sizov [Thu, 3 May 2012 13:15:59 +0000 (06:15 -0700)]
Merge pull request #778 from netdata/Allow_short_project_names
Allow short project names
Wouter D'Haeseleer [Thu, 3 May 2012 12:19:06 +0000 (14:19 +0200)]
Define a default value as suggested by ariejan
Wouter D'Haeseleer [Thu, 3 May 2012 10:53:24 +0000 (12:53 +0200)]
Allow short project names
We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...
Wouter D'Haeseleer [Thu, 3 May 2012 10:35:46 +0000 (12:35 +0200)]
Make permission overview structured
The current overview is a mess.
This pull commit will make it look more clean.
All permissions are alliged between the columns and the master rights
have been enchanced with all its rights.
Wouter D'Haeseleer [Thu, 3 May 2012 10:20:27 +0000 (12:20 +0200)]
When the email address is empty gitlab will give a 500 error
Since some conversion tools do commits with an empty commiters email
address gitlab will fail with a 500 error
michaeltrimm [Mon, 30 Apr 2012 14:33:00 +0000 (11:33 -0300)]
Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that causes the rake to fail and the system not properly install the default user and password.
Ariejan de Vroom [Sun, 29 Apr 2012 21:45:01 +0000 (00:45 +0300)]
Try running against 1.9.3 again.
Zevs [Sun, 29 Apr 2012 21:24:59 +0000 (00:24 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Zevs [Sun, 29 Apr 2012 21:23:19 +0000 (00:23 +0300)]
Task#755 auto-merge don`t work correctly.
Valeriy Sizov [Sun, 29 Apr 2012 07:39:15 +0000 (10:39 +0300)]
small fix installation`s guide.
Valery Sizov [Thu, 26 Apr 2012 22:09:23 +0000 (01:09 +0300)]
MR: change path to lock file
Valery Sizov [Thu, 26 Apr 2012 21:55:26 +0000 (00:55 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Valery Sizov [Thu, 26 Apr 2012 21:53:55 +0000 (00:53 +0300)]
Task #735 Automerge should not be checked on every load of MR show page
Dmitriy Zaporozhets [Thu, 26 Apr 2012 17:43:12 +0000 (20:43 +0300)]
Hooks UI improved, Request tests added
Dmitriy Zaporozhets [Thu, 26 Apr 2012 11:05:09 +0000 (04:05 -0700)]
Merge pull request #743 from qqshfox/fix_issue_742
fix #742
Hanfei Shen [Thu, 26 Apr 2012 11:00:29 +0000 (19:00 +0800)]
fix #742
Dmitriy Zaporozhets [Thu, 26 Apr 2012 09:09:07 +0000 (02:09 -0700)]
Merge pull request #741 from mgesmundo/master
Cosmetic change in menu
mgesmundo [Thu, 26 Apr 2012 08:55:46 +0000 (11:55 +0300)]
Cosmetic change in menu
Valeriy Sizov [Tue, 24 Apr 2012 20:59:27 +0000 (13:59 -0700)]
Merge pull request #732 from mmozuras/ldap_name_utf8
Force utf-8 encoding for ldap omniauth_info.name
Dmitriy Zaporozhets [Tue, 24 Apr 2012 18:47:01 +0000 (21:47 +0300)]
Home button should targeted on root page of context
gitlabhq [Tue, 24 Apr 2012 14:52:10 +0000 (17:52 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
gitlabhq [Tue, 24 Apr 2012 18:49:34 +0000 (21:49 +0300)]
New project page improved. User profile improved. Show issues, participant on Milestone show page.
Dmitriy Zaporozhets [Tue, 24 Apr 2012 10:55:03 +0000 (03:55 -0700)]
Merge pull request #704 from tader/workaround-charlock-holmes
Rescue from CharlockHolmes failures.
Thomas A. de Ruiter [Tue, 24 Apr 2012 10:41:20 +0000 (12:41 +0200)]
Rescue from CharlockHolmes failure
mmozuras [Tue, 24 Apr 2012 07:42:30 +0000 (10:42 +0300)]
Force utf-8 encoding for ldap omniauth_info.name
Ariejan de Vroom [Tue, 24 Apr 2012 06:34:00 +0000 (23:34 -0700)]
Merge pull request #726 from kvs/patch-1
Fix very minor spelling issue.
Kenneth Vestergaard [Mon, 23 Apr 2012 14:41:15 +0000 (17:41 +0300)]
Fix very minor spelling issue.
gitlabhq [Mon, 23 Apr 2012 12:32:56 +0000 (15:32 +0300)]
fixed email markdown
Ariejan de Vroom [Mon, 23 Apr 2012 07:54:19 +0000 (10:54 +0300)]
Make sure tmp/merge_repo is available to write lock files for auto-merge.
Dmitriy Zaporozhets [Sun, 22 Apr 2012 13:49:45 +0000 (16:49 +0300)]
corrected exception for automerge
Dmitriy Zaporozhets [Sun, 22 Apr 2012 13:38:39 +0000 (06:38 -0700)]
Merge pull request #713 from gitlabhq/fast_automerge
Fast automerge
Valery Sizov [Sun, 22 Apr 2012 13:14:01 +0000 (16:14 +0300)]
fast automerge: done
Dmitriy Zaporozhets [Sun, 22 Apr 2012 13:01:59 +0000 (16:01 +0300)]
logo changed for header
Valery Sizov [Sun, 22 Apr 2012 12:19:09 +0000 (15:19 +0300)]
fast automerge: base implementation