deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4303 commits 6 branches 43 tags 25 MiB
Commit graph

4303 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets 8943714cdf 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)
 2012-05-20 01:01:29 -07:00
Andrey Vakarev fed1c98047 Refactoring: get rid of ruby antipattern unless/else and use if/else instead 2012-05-20 03:01:13 +03:00
Andrey Vakarev b7160380ed Get rid of useless public/index.html (auto-generated file when new rails app was created) 2012-05-20 02:15:12 +03:00
Dmitriy Zaporozhets f33cf247b6 Merge pull request #833 from Nek-/patch-utf8 
Added force utf8 encoding
 2012-05-19 03:34:20 -07:00
Dmitriy Zaporozhets 5d24082787 Preparing to v2.5 2012-05-19 13:17:34 +03:00
Nek 8c7c43b94f Added force utf8 encoding 2012-05-19 12:12:49 +02:00
Dmitriy Zaporozhets 860e3ab526 Event feed: Icons for some events 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets 1e4d15b406 Password & token split up, icon to button for top panel 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets eb25bfe2b2 Merge pull request #832 from akzhan/master 
Use modified pygments.rb to allow dependency to rubypython 0.6
 2012-05-19 00:35:20 -07:00
Akzhan Abdulin 7c154aa460 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. 2012-05-19 09:33:19 +02:00
Dmitriy Zaporozhets 02dc256514 Branches pages polished. few css improvements 2012-05-18 00:23:18 +03:00
mikkyhouse 2b319d0496 Merge pull request #828 from CedricGatay/feature/chosen_0.9.8_searchContains 
Chosen 0.9.8 + Autocomplete contains
 2012-05-17 09:46:03 -07:00
Cedric Gatay 0bdcf2e1dc 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.
 2012-05-17 18:41:15 +02:00
Dmitriy Zaporozhets 9cd8f7b082 New Feature: Git Blame for file 2012-05-17 19:11:45 +03:00
Dmitriy Zaporozhets 2e54ac17c5 Merge pull request #827 from oreofish/bugfix 
fix bug in mailer
 2012-05-16 23:34:28 -07:00
RickXing 4c503be0f1 fix bug in mailer 2012-05-17 14:30:24 +08:00
Dmitriy Zaporozhets ce2214a1f0 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
 2012-05-16 08:27:30 -07:00
Robb Kidd 0dd87789a1 Update Notify spec to use host set in config/gitlab.yml 
Fixes failing tests introduced in pull request #824
 2012-05-16 11:25:18 -04:00
Dmitriy Zaporozhets caa065670e Merge pull request #825 from demelziraptor/master 
View project pages without master branch
 2012-05-16 07:45:28 -07:00
Demelziraptor e5bbefc980 change find_or_first to work with default branch 2012-05-16 14:47:59 +01:00
Dmitriy Zaporozhets 1b85cbc6d6 Merge pull request #824 from robbkidd/test_the_mailers 
Spec Notify mailers
 2012-05-15 23:36:09 -07:00
Robb Kidd 991d23e216 Change calls to Notify methods to send IDs instead of objects. 2012-05-15 22:37:34 -04:00
Robb Kidd e660043d22 Make Notify#new_merge_request_email resque friendly. 2012-05-15 22:37:34 -04:00
Robb Kidd 39061af9f8 Make Notify#new_issue_email resque friendly. 2012-05-15 22:37:34 -04:00
Robb Kidd 2d124d9496 Add delegate for project's name on Note. 2012-05-15 22:37:34 -04:00
Robb Kidd 41c00a20a9 Make Notify#note_wall_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:34 -04:00
Robb Kidd 0a9a2c2a0b 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.
 2012-05-15 22:37:34 -04:00
Robb Kidd 435fd8f087 Make Notify#note_issue_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:34 -04:00
Robb Kidd bb22360d1a Make Notify#note_merge_request_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:33 -04:00
Robb Kidd 5fe75649b3 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.
 2012-05-15 22:37:33 -04:00
Robb Kidd dd921053c8 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.
 2012-05-15 22:35:53 -04:00
Robb Kidd 345f176a74 Update new_user_email to take id for User and perform find itself. 2012-05-15 22:35:53 -04:00
Robb Kidd 06b45acb8f Add specs for all of the emails. 2012-05-15 22:35:53 -04:00
Robb Kidd c7489578e6 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.
 2012-05-15 22:35:53 -04:00
Dmitriy Zaporozhets be79c9def9 CSS improvements for diff & file view 2012-05-15 19:35:18 +03:00
Dmitriy Zaporozhets a27ee18428 Merge pull request #823 from kugaevsky/main_menu_styles 
CSS fix: main menu buttons dividers
 2012-05-15 08:41:05 -07:00
Nick Kugaevsky 6a4ae93f57 CSS fix: main menu buttons dividers 2012-05-15 18:50:27 +04:00
Dmitriy Zaporozhets 81a89f6a83 Merge pull request #822 from kugaevsky/activity_stream 
Activity stream labels css fix
 2012-05-15 07:13:06 -07:00
Nick Kugaevsky 451118f19a Activity stream: event labels css fix — proper paddings. 2012-05-15 17:47:01 +04:00
Nick Kugaevsky 7406fb5b12 Activity stream: commit labels css fix — proper paddings and highlighting on hover. 2012-05-15 17:46:18 +04:00
Dmitriy Zaporozhets fab42a612e Merge pull request #814 from kugaevsky/patch-1 
Minor headers styles in readme fix: increased line-height for h1..h4.
 2012-05-15 01:08:30 -07:00
Dmitriy Zaporozhets 17bd6b13bc Merge pull request #821 from oreofish/showmarkdown 
show rendered file if it is .markdown file
 2012-05-15 00:18:49 -07:00
Dmitriy Zaporozhets e84411ef33 Merge pull request #820 from robbkidd/add_missing_call_to_find 
Fix bug: missing call to MergeRequest.find in Notify#changed_merge_request_email
 2012-05-15 00:17:44 -07:00
RickXing 465a195117 show rendered file if it is .markdown file 2012-05-15 09:23:14 +08:00
Robb Kidd e0b709266e Fix missing call to MergeRequest.find in Notify#changed_merge_request_email 2012-05-14 20:19:28 -04:00
Dmitriy Zaporozhets 65382133d5 Merge pull request #761 from michaeltrimm/patch-1 
Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that...
 2012-05-13 08:20:14 -07:00
Valeriy Sizov b5d5ecd155 Merge pull request #812 from bgondy/patch-1 
Adding sudo before sudo rm -rf /tmp/gitolite-admin (privileges needed)
 2012-05-12 22:50:57 -07:00
Dmitriy Zaporozhets dd79dba804 Merge pull request #809 from robbkidd/spec_protected_branch 
Add spec for ProtectedBranch.
 2012-05-12 11:31:12 -07:00
Dmitriy Zaporozhets e81ba7b249 Fixed Gemfile.lock 2012-05-12 21:17:42 +03:00
Dmitriy Zaporozhets 39504aa19b Merge branch 'resquemailer' of https://github.com/oreofish/gitlabhq into oreofish-resquemailer 
Conflicts:
	Gemfile.lock
 2012-05-12 21:02:13 +03:00