Nihad Abbasov
faa0ec7c63
cleanup User model
2012-05-29 17:13:41 +05:00
Nihad Abbasov
fc74627f3c
fix typo in spec file name
2012-05-29 17:11:55 +05:00
Dmitriy Zaporozhets
133102a7eb
Merge pull request #866 from NARKOZ/travis-ruby193
...
Travis and Ruby 1.9.3
2012-05-29 03:25:47 -07:00
Saito
e1d1673e74
monkey patch grit to support utf8 encoding
2012-05-29 16:17:31 +08:00
Saito
206230a4ec
rewrite encode strategy.
2012-05-29 16:16:59 +08:00
Nihad Abbasov
e4d47d30de
fix travis issues and run build against ruby 1.9.3
2012-05-29 02:38:15 +05:00
Nihad Abbasov
632415567f
use shoulda-matchers instead of shoulda gem
2012-05-29 02:35:50 +05:00
randx
89043d6b89
MR: Accept section polished. Show permission info
2012-05-28 20:19:54 +03:00
randx
b729004a50
[Tests] Update team member permission
2012-05-27 20:52:40 +03:00
randx
2a67879b75
[Tests] Fixed graph test
2012-05-27 13:40:43 +03:00
randx
9cd1069a8c
[Tests] Better project coverage
2012-05-27 13:39:57 +03:00
randx
baa54629a9
[Tests] added spec for search page
2012-05-27 13:22:23 +03:00
randx
020caf1274
Fixed wrong module name
2012-05-27 12:34:25 +03:00
randx
d72f8db08a
Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding
...
Conflicts:
lib/gitlab/encode.rb
2012-05-27 12:20:35 +03:00
Gabriel Mazetto
11f90ae42e
Forgot to refactor a line on lib/gitlabhq/encode.rb
2012-05-26 23:19:37 -03:00
Gabriel Mazetto
50c2c16a4d
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.
2012-05-26 20:15:06 -03:00
randx
d29ec9d773
Images refactored, Feed icon replaced, Fixed comment form focus
2012-05-27 01:12:28 +03:00
Gabriel Mazetto
48a36851e6
It's dangerous to rescue errors here as it will hide bugs. define_tree_vars already catch all situations where something may not exist.
2012-05-26 15:56:11 -03:00
Gabriel Mazetto
39def0dcbb
Better fix for encoding problems on rendering of inline file visualizations like README files.
2012-05-26 15:56:11 -03:00
Gabriel Mazetto
eb5749ed39
Fixed encoding problems with plain/text blobs being sent without charset.
2012-05-26 15:55:53 -03:00
Valeriy Sizov
c4b7794352
Merge pull request #862 from hfase01/patch-1
...
Updated; libreadline-dev > libreadline-gplv2-dev
2012-05-26 04:52:59 -07:00
randx
597236252a
Merge branch 'lib_refactoring'
2012-05-26 13:38:07 +03:00
randx
3272620f72
lib/ refactoring. Module Gitlabhq renamed to Gitlab
2012-05-26 13:37:49 +03:00
Hans Fase
74d62957b6
Updated; libreadline-dev libreadline-gplv2-dev
...
;) Have fun!
2012-05-26 02:35:50 -03:00
Dmitriy Zaporozhets
8ceb94081a
[Travis] try run both db
2012-05-25 16:38:23 +03:00
Dmitriy Zaporozhets
ddc7568fec
Milestone show, Team index: Better UI
2012-05-24 09:23:52 +03:00
Valeriy Sizov
db78a63eb1
Merge pull request #855 from talltroym/patch-1
...
Corrected line for running gl-system-install
2012-05-23 13:20:01 -07:00
Troy Murray
db048f1f8f
Corrected line for running gl-system-install
2012-05-23 15:45:02 -03:00
Dmitriy Zaporozhets
ec66578b5c
Merge pull request #850 from Skarm/master
...
fix merge_requests.html.haml
2012-05-23 03:19:56 -07:00
Eric
837a78db2e
fix merge_requests.html
2012-05-23 15:20:41 +06:00
Dmitriy Zaporozhets
d2a12e0286
Merge pull request #849 from SaitoWu/bugfix/css
...
fix No route matches static.css Error
2012-05-22 20:05:07 -07:00
Saito
c5b12fad44
fix No route matches static.css Error
2012-05-23 11:00:51 +08:00
Dmitriy Zaporozhets
cc8369144d
Prevent app crash in case if encoding failed
2012-05-22 14:57:04 +03:00
Dmitriy Zaporozhets
1b2068eaa9
Gem updates & githost logger
...
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
2012-05-21 23:17:41 +03:00
Dmitriy Zaporozhets
09831488c9
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
2012-05-20 01:02:14 -07:00
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
