Commit graph

3241 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
8803fbb593 merge request: notes, diffs, commits 2011-11-28 22:16:57 +02:00
Dmitriy Zaporozhets
c0e5bc5ee8 tests for merge request creation 2011-11-28 20:50:25 +02:00
Dmitriy Zaporozhets
60c6649a9a tests for merge request index/show 2011-11-28 20:42:32 +02:00
Dmitriy Zaporozhets
6b941cf92c merge request list 2011-11-28 20:30:35 +02:00
Saito
7002b9ff11 Merge branch 'chardet' 2011-11-28 18:25:53 +08:00
Saito
46cbe54189 fix the issue on github #157.
directly force_encoding is wrong,
must detect the file string's encoding.
then force_encoding the string to it's encoding.
last convert it to utf-8.
2011-11-28 17:46:41 +08:00
Saito
75fa0632e6 add rchardet19 to detect string encoding 2011-11-28 17:34:11 +08:00
Dmitriy Zaporozhets
6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00
Dmitriy Zaporozhets
2244203968 remove save_adn_open_page from specs 2011-11-27 17:39:58 +02:00
Dmitriy Zaporozhets
a031813887 Commit, network graph refactoring 2011-11-27 17:35:49 +02:00
Dmitriy Zaporozhets
1b2fba08fe Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-11-27 15:14:25 +02:00
Dmitriy Zaporozhets
53600fca0a Merge pull request #154 from michaelklishin/patch-1
Do not install ruby-debug on travis-ci.org, it only wastes time
2011-11-27 05:14:03 -08:00
Dmitriy Zaporozhets
39a1b7d3f7 margin for notes content 2011-11-27 15:12:48 +02:00
Michael Klishin
cce1231b8e Do not install ruby-debug on travis-ci.org, it only wastes time
See http://about.travis-ci.org/docs/user/languages/ruby/ (the "Exclude non-essential gems like ruby-debug" section) for reasoning.
2011-11-27 17:11:47 +04:00
Dmitriy Zaporozhets
8ad1f8a474 activities page caching 2011-11-27 14:53:12 +02:00
Dmitriy Zaporozhets
fb8f05ee16 activity events reduced to 20 from 40 2011-11-27 10:37:37 +02:00
Dmitriy Zaporozhets
32ebd438c2 Issue #263 - dont display ajax loader on commit page if commits < limit 2011-11-27 10:36:28 +02:00
Dmitriy Zaporozhets
814eeb45e6 fixed bg for dark file preview 2011-11-26 21:14:50 +02:00
Dmitriy Zaporozhets
3aee553523 colorscheme for code view 2011-11-26 01:42:42 +02:00
Dmitriy Zaporozhets
139a332293 updated readme 2011-11-26 00:30:51 +02:00
Dmitriy Zaporozhets
ade12da948 up to 1.2.2 2011-11-26 00:24:44 +02:00
Dmitriy Zaporozhets
0accbaae15 snippets restyle 2011-11-26 00:19:14 +02:00
Dmitriy Zaporozhets
80c34985c8 removed icons 2011-11-25 23:57:08 +02:00
Dmitriy Zaporozhets
a9928eae48 fixed sidebar zero count 2011-11-25 23:44:02 +02:00
Dmitriy Zaporozhets
15fa14f1d6 get rid off modal window for issue create/edit 2011-11-25 23:40:12 +02:00
Dmitriy Zaporozhets
16bd018f08 clickable news feed on dashboard 2011-11-25 22:26:44 +02:00
Dmitriy Zaporozhets
367c4f42f0 one config file, git options added 2011-11-25 22:18:36 +02:00
Dmitriy Zaporozhets
8209a2ff49 cleaning side menu 2011-11-25 21:56:05 +02:00
Dmitriy Zaporozhets
9b3fabcc9a mail host url to email.yml 2011-11-25 20:50:27 +02:00
gitlabhq
a8e4fb6144 Merge branch 'feature/issue_with_branch' 2011-11-25 06:13:15 -05:00
gitlabhq
4aad057f23 issues style fixed 2011-11-25 05:49:28 -05:00
gitlabhq
4e55cc67f5 Issue show page restyled 2011-11-25 05:41:30 -05:00
Dmitriy Zaporozhets
c3ea3c5721 Merge pull request #146 from maknoll/master
link "GITLAB" logo to root_url instead of '/'
2011-11-24 16:04:34 -08:00
Martin Knoll
07fefc9206 Fixes issue with logo linking to the server root, instead of the app root.
If using multiple Rails apps in subfolders, the upper left "GITLAB" button links to '/' and thats kinda wrong.
This fix creates a link to the root_url instead, which works in every case.
2011-11-25 01:01:58 +01:00
Dmitriy Zaporozhets
5d1a1a92b7 Merge pull request #142 from shaneog/master
Use HTTPS protocol in Gemfile
2011-11-24 09:35:55 -08:00
Dmitriy Zaporozhets
3e33671586 Merge pull request #144 from nono/patch-1
Don't install development and test gems in production
2011-11-24 09:35:32 -08:00
gitlabhq
b7f4f67b9b issue show finished 2011-11-24 11:47:27 -05:00
gitlabhq
2fbf45b2e0 issue message output 2011-11-24 10:15:30 -05:00
gitlabhq
ee2d3de1a6 ability to attach branch to issue 2011-11-24 08:08:20 -05:00
Bruno Michel
310f0131b2 Don't install development and test gems in production 2011-11-24 12:51:32 +01:00
Dmitriy Zaporozhets
b4c40c212c removed activities page cache cause some bugs 2011-11-23 22:12:36 +02:00
Shane O'Grady
284ba65e8a Use HTTPS Protocol in Gemfile
Switch to the https protocol in the Gemfile & Gemfile.lock since the
git protocol is sometimes blocked by firewalls (and is not easily proxied)
2011-11-23 12:27:06 +00:00
Dmitriy Zaporozhets
21d566ea76 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-22 23:52:15 +02:00
Valery Sizov
d61268e4f1 [#169] – Move email 'from' & 'host' settings to config file 2011-11-22 23:36:14 +02:00
Dmitriy Zaporozhets
7ebba27db2 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-22 23:15:09 +02:00
Valery Sizov
a4fbe13fce [#243] – When user adds first key the add a key message should go away 2011-11-22 22:26:07 +02:00
Valery Sizov
1bcdc0a505 [#187] First time user try access gitosis 2011-11-22 22:11:49 +02:00
Valery Sizov
540d0aa406 fixd key length 2011-11-22 21:56:22 +02:00
Dmitriy Zaporozhets
b56024100d lil style fixes 2011-11-22 19:57:25 +02:00
Dmitriy Zaporozhets
4451b8df8a 3 events on dashboard, fixed issue gl#250 2011-11-22 19:54:36 +02:00