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

3398 commits

This branch
This branch
All branches
Author SHA1 Message Date
RickXing 81f666d8dc only address resque works in post_receive and mailer queue 2012-06-10 17:11:34 +08:00
Dmitriy Zaporozhets 5759f97598 Merge pull request #908 from avakarev/update-rails-to-3.2.5 
Update rails version to 3.2.5
 2012-06-10 01:36:41 -07:00
Dmitriy Zaporozhets db84a5b1b6 Merge pull request #904 from gitlabhq/models_refactoring 
Models Refactoring: Move methods to roles
 2012-06-10 01:25:53 -07:00
Valeriy Sizov 74a8fee385 Merge pull request #911 from JamesEarlDouglas/master 
Fix a minor typo in example configuration file
 2012-06-09 01:15:02 -07:00
James Earl Douglas fd99863565 fix typo: congiguration 2012-06-08 16:24:33 -07:00
Andrey Vakarev 93f3fedef5 Update rails version to 3.2.5 2012-06-08 13:28:19 +03:00
Dmitriy Zaporozhets c7323e8f09 Merge pull request #907 from NARKOZ/markdown_code_encoding 
set encoding to utf-8 for pygments.rb wrapper
 2012-06-08 01:41:22 -07:00
Nihad Abbasov 604725f4f1 specify utf-8 encoding for pygments.rb markdown wrapper 2012-06-08 01:23:31 -07:00
Dmitriy Zaporozhets 0a70aca3b1 Models Refactoring: Move methods to roles 2012-06-07 15:44:57 +03:00
Valeriy Sizov 98b8416647 Merge pull request #898 from kritik/patch-1 
new ruby version and fix of Ubuntu
 2012-06-06 05:24:54 -07:00
Vladimir Krylov cfa1b4c7f6 new rubby version and fix of https://github.com/gitlabhq/gitlabhq/issues/326 issue 2012-06-06 12:46:55 +03:00
randx 9546c57fd7 Added grit ci build status to readme 2012-06-05 20:31:09 +03:00
Dmitriy Zaporozhets 73692f215a Merge pull request #888 from gitlabhq/remove_sorce_branch_after_merge 
ability to remove source branch after merge
 2012-06-05 10:27:25 -07:00
randx 2d68e7f4cd MR -> remove source branch -> UI pollished 2012-06-05 19:45:18 +03:00
Zevs d6ed9920d6 #888 prevent to remove source_branch 2012-06-05 00:11:07 +03:00
Zevs 3b41b1839b ability to remove source branch after merge 2012-06-05 00:11:07 +03:00
Zevs 11f72732a8 actualize Gemfile.lock 2012-06-04 21:45:23 +03:00
Zevs 3ffb9cbfa9 Task#879 Relocated gitolite repo and lock file 2012-06-04 21:41:26 +03:00
Zevs a0db028c1b Merge remote-tracking branch 'avakarev/remove-trailing-whitespaces-in-templates' 2012-06-04 19:18:34 +03:00
Valeriy Sizov f12ac71bf8 use stable branch as default. 2012-06-04 17:38:08 +03:00
Andrey Vakarev 3bd06d55e0 Remove trailing whitespaces and trailing lines 2012-06-04 01:37:27 +03:00
Dmitriy Zaporozhets 7e0726b1da Merge pull request #890 from avakarev/clean-up-helpers 
Clean up helpers
 2012-06-03 13:45:55 -07:00
Andrey Vakarev 6ee4548c99 Removed empty helpers (probably auto-generated) 2012-06-03 22:32:40 +03:00
Andrey Vakarev 16b49124be Remove unused methods 2012-06-03 22:27:34 +03:00
Dmitriy Zaporozhets a35a12980e Merge pull request #887 from nathanvda/improve_tag_count 
Improve performance when handling large repo's
 2012-06-03 08:05:54 -07:00
nathanvda c4d4040898 Point to the correct grit with the tag_count and branch_count methods. 2012-06-03 11:51:54 +02:00
Valeriy Sizov 6b042b1699 Merge pull request #884 from amferraz/patch-1 
Compatibilizing with a fresh install of ubuntu 12.04 LTS i386 (virtualized)
 2012-06-03 02:49:15 -07:00
Dmitriy Zaporozhets aadf9d607e Merge pull request #885 from avakarev/clean-up-application_helper 
Clean up application_helper.rb code
 2012-06-03 00:54:34 -07:00
Dmitriy Zaporozhets 765c1b278a Merge pull request #886 from avakarev/clean-up-tab_helper 
Clean up tab_helper.rb code
 2012-06-03 00:53:27 -07:00
nathanvda 3792d624b6 Use the faster alternative methods in grit to count tags and branches (which I added). This is much faster in all cases, but especially on large repositories the difference should be obvious. 2012-06-03 03:24:59 +02:00
Andrey Vakarev 2048750029 Clean up application_helper.rb code 2012-06-03 04:08:01 +03:00
Andrey Vakarev fb4b571fa6 Clean up tab_helper.rb code 2012-06-03 03:58:49 +03:00
cacovsky 7b6f51efc8 Compatibilizing with a fresh install of ubuntu 12.04 LTS i386 (virtualized). 2012-06-02 20:19:36 -03:00
randx cbea0af290 custom select styled, tree table no round borders 2012-06-02 01:00:29 +03:00
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