Commit graph

4214 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 16427f4c40 Merge pull request #880 from NARKOZ/dashboard-feed
Dashboard feed
2012-06-01 07:25:54 -07:00
Nihad Abbasov cc3c6ad0ef allow login via private token only for atom feeds 2012-06-01 06:56:28 -07:00
Nihad Abbasov f8f6ff065e add projects atom feed 2012-05-31 23:42:02 -07:00
randx 96308f7534 Milestones: progressbar from bootstrap. Bradcrumbs styles 2012-06-01 00:10:52 +03:00
randx 17d4cac208 Rescue encoding error on controller level 2012-05-31 23:36:52 +03:00
randx a719bfc931 Graph: navigation with keyboard 2012-05-31 23:31:17 +03:00
Nihad Abbasov bcfdacf0d4 Merge pull request #873 from sch0rsch/796-bash-path
Bash path in post-receive-hook
2012-05-31 07:55:41 -07:00
Sven Amonat 6f229c4fb2 - fix bash path 2012-05-31 15:19:48 +02:00
Valeriy Sizov 45988ad817 Merge pull request #787 from yas375/patch-1
removing /tmp/gitolite-admin in installation script with sudo
2012-05-31 05:29:46 -07:00
randx 78f4c789b3 Improved Commit diff -> Images. Red border for removed & green for added images 2012-05-30 21:02:30 +03:00
randx b826a684c7 Fix MR modal bug 2012-05-30 19:46:09 +03:00
Dmitriy Zaporozhets 2cf8010792 Merge pull request #868 from SaitoWu/bugfix/encoding
Bugfix/encoding
2012-05-30 00:24:43 -07:00
Saito e851cb0776 must force_encoding to utf-8 first 2012-05-30 13:40:47 +08:00
Saito c62715acc9 now render the correct authorname and message 2012-05-30 12:11:03 +08:00
Saito 34cc38b6f5 diff now no need to force_encoding to utf8 2012-05-30 11:56:48 +08:00
Saito 202807c21a remove detect_enoding. detect_encoding means force_encoding to the file.data's encoding, not encoding to utf8. will cause encoding problem. 2012-05-30 11:56:00 +08:00
Saito c71a76e71a fix graph problem if authorname or message isnot utf8 encoding 2012-05-30 11:47:26 +08:00
Saito efd9a717c1 solve the binary problem 2012-05-30 11:44:36 +08:00
Dmitriy Zaporozhets af226ae9c9 Merge pull request #867 from NARKOZ/refactoring
Refactoring and assets cleanup
2012-05-29 12:59:07 -07:00
Nihad Abbasov 7c7761099c fix deprecation warnings 2012-05-29 19:16:28 +05:00
Nihad Abbasov 058d80b336 fix file extension
[ci skip]
2012-05-29 18:55:55 +05:00
Nihad Abbasov 865cf830c4 get rid of unused assets, use gems instead 2012-05-29 18:45:18 +05:00
Nihad Abbasov f01994e1f8 move assets from lib directory to vendor
[ci skip]
2012-05-29 17:56:48 +05:00
Nihad Abbasov 8c7caaa69c use chosen-rails 2012-05-29 17:50:10 +05:00
Nihad Abbasov 475d9f487f use ffaker gem 2012-05-29 17:35:34 +05:00
Nihad Abbasov 078b312a31 cleanup Gemfile 2012-05-29 17:22:26 +05:00
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