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

4074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ariejan de Vroom 85468fb4ce Use secure.gravatar.com when running over SSL 2011-11-09 20:51:22 +02:00
Ariejan de Vroom 786fe29db4 Moved shoulda to the :test group in Gemfile. This prevennts rake test 
from running after every other rake command.
 2011-11-09 20:50:58 +02:00
Dmitriy Zaporozhets fd7de95bce Merge branch 'dev' 2011-11-09 20:32:56 +02:00
Dmitriy Zaporozhets 982ba4561a Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-09 20:32:08 +02:00
Dmitriy Zaporozhets 8513526bfe Merge branch 'dev' 2011-11-09 20:31:52 +02:00
Dmitriy Zaporozhets 30e34171b6 Merge branch 'master' into dev 2011-11-09 20:30:34 +02:00
Dmitriy Zaporozhets fe1433c379 Merge branch 'dev' 
Conflicts:
	app/helpers/dashboard_helper.rb
 2011-11-09 20:29:59 +02:00
Dmitriy Zaporozhets 260ef03c18 Merge branch 'dev' 2011-11-09 18:47:53 +02:00
Dmitriy Zaporozhets c98301d759 Merge pull request #81 from ariejan/fix_for_dashboard_grit_commit 
Show commits as 'Commit' instead of 'Grit::Commit'
 2011-11-09 08:05:47 -08:00
Ariejan de Vroom 4454b6c593 Show commits as 'Commit' instead of 'Grit::Commit' 2011-11-09 16:59:51 +01:00
Dmitriy Zaporozhets 6e7e01c779 Merge pull request #78 from ariejan/fix_gemfile_shoulda 
Moved shoulda to the :test group in Gemfile.
 2011-11-09 06:24:27 -08:00
Dmitriy Zaporozhets a0a1b9e507 Merge pull request #79 from ariejan/fix_https_gravatar 
Use secure.gravatar.com when running over SSL
 2011-11-09 06:23:53 -08:00
Ariejan de Vroom 4dbed7ca88 Use secure.gravatar.com when running over SSL 2011-11-09 15:15:21 +01:00
Nihad Abbasov 3f70316c5f fix elsif statement 2011-11-09 17:53:15 +04:00
Ariejan de Vroom 1d30877a68 Moved shoulda to the :test group in Gemfile. This prevennts rake test 
from running after every other rake command.
 2011-11-09 14:29:09 +01:00
gitlabhq b78f658143 dashboard beautify 2011-11-09 06:37:01 -05:00
Dmitriy Zaporozhets a44e329222 project dashboard updated 2011-11-09 01:56:10 +02:00
Aleksei Kvitinskii 1d85197b08 Merge branch 'issue-184' into dev 
Conflicts:
	app/views/layouts/project.html.haml
	app/views/projects/_form.html.haml
 2011-11-08 23:19:42 +02:00
Aleksei Kvitinskii 5b1634cd4b implemented cookie remember option for issue page filter 2011-11-08 23:02:57 +02:00
gitlabhq faa87e61bf Merge branch 'dev' 2011-11-08 12:26:28 -05:00
gitlabhq 49bced3a24 project form fixed 2011-11-08 12:23:13 -05:00
Aleksei Kvitinskii 1fa01cbcc9 fix typo 2011-11-08 00:02:50 +02:00
Dmitriy Zaporozhets 7066444fda Merge branch 'dev' 2011-11-07 23:22:25 +02:00
Dmitriy Zaporozhets 1c543bdfa8 restored sortable ability 2011-11-07 22:48:55 +02:00
Dmitriy Zaporozhets 32abaa33f8 Merge branch 'issues_restyle' into dev 2011-11-07 22:32:01 +02:00
Dmitriy Zaporozhets 67b9fa51dc fixed tests 2011-11-07 22:31:51 +02:00
Aleksei Kvitinskii 9e3915b259 fix typo in the template 2011-11-07 21:39:24 +02:00
Aleksei Kvitinskii 444b69ddc2 Merge branch 'dev' into issue-184 
Conflicts:
	app/views/layouts/project.html.haml
 2011-11-07 21:29:28 +02:00
Aleksei Kvitinskii 4a1b70f7b2 add tags to admin project form 2011-11-07 20:38:54 +02:00
Aleksei Kvitinskii 9054f64c53 correct padding in user, keys, password forms 2011-11-07 20:37:32 +02:00
Aleksei Kvitinskii eb5fa8344e correct padding in issue form and in profile form 2011-11-07 20:21:42 +02:00
Aleksei Kvitinskii af7bed2aa5 add tag links to project page 2011-11-07 19:48:58 +02:00
gitlabhq 60f083ad61 issues table header 2011-11-07 11:31:05 -05:00
gitlabhq c07d3dfc04 issue restyle example 2011-11-07 10:55:16 -05:00
Aleksei Kvitinskii 3fe9f3ebe6 implemented cookie remember option for issue page filter 2011-11-07 14:12:46 +02:00
Aleksei Kvitinskii 060a2e2257 move tag path to the appropriate helper 2011-11-07 13:40:22 +02:00
Aleksei Kvitinskii ac9afe0d14 Merge branch 'dev' into issue-184 2011-11-07 11:20:20 +02:00
Dmitriy Zaporozhets 06e916743e lil css style 2011-11-07 00:24:09 +02:00
Dmitriy Zaporozhets 7ac38b7a1e fixed duplicate on wall 2011-11-06 23:32:37 +02:00
Dmitriy Zaporozhets 8170da06a6 Merge branch 'dev' into gh_master 2011-11-06 23:13:52 +02:00
Dmitriy Zaporozhets 0d4128bff1 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-06 22:54:17 +02:00
Dmitriy Zaporozhets 63c2c2cc23 Merge branch 'dev' 2011-11-06 22:53:54 +02:00
Dmitriy Zaporozhets e29a25662d fixed 1click repo url selection 2011-11-06 22:53:36 +02:00
Dmitriy Zaporozhets b4868a8972 Improved commit author detection 2011-11-06 22:38:08 +02:00
Dmitriy Zaporozhets f87f0201f0 link to author on tree view item 2011-11-06 22:21:48 +02:00
Aleksei Kvitinskii 1d1b5186c3 fix small bug in top menu (buttons change height on press in chrome) 2011-11-06 21:43:34 +02:00
Dmitriy Zaporozhets 121f6d04fa fixed conflicts 2011-11-06 21:12:23 +02:00
Dmitriy Zaporozhets b8ca1d62c4 Merge branch 'dev' 
Conflicts:
	app/assets/images/ajax-loader.gif
	public/favicon.ico
 2011-11-06 21:07:56 +02:00
Aleksei Kvitinskii 526752479d correct html on project page 2011-11-06 20:48:57 +02:00
Aleksei Kvitinskii 98fcd3b38a correct html on project page 2011-11-06 20:48:21 +02:00