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

1931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx 6d4ae75f54 Final fix for dashboard cucumber feature 2012-08-24 13:17:19 +03:00
randx 919cd60216 Merge branch 'feature/labels' 2012-08-24 13:07:14 +03:00
randx 3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
randx 14bd9c9228 Fix dashboard issues atom feed rspec 2012-08-24 12:17:05 +03:00
randx a502f67c0b Up to 2.8.2 2012-08-24 12:03:48 +03:00
randx 4381084af3 Trying to get rid of random dashboard/issues cucumber fail 2012-08-24 11:48:30 +03:00
randx b962bcd4a7 draper Gemfile.lock 2012-08-22 01:25:11 +03:00
Dmitriy Zaporozhets 52f657aa15 Merge pull request #1286 from steveklabnik/master 
Misspelled Draper
 2012-08-24 01:29:52 -07:00
Dmitriy Zaporozhets d66f69221a Merge pull request #1284 from jouve/fix-inline-forms 
fix inline forms
 2012-08-24 01:29:05 -07:00
Dmitriy Zaporozhets 46923d1acb Merge pull request #1285 from tsigo/gemfile_cleanup 
Gemfile cleanup
 2012-08-24 01:09:21 -07:00
Steve Klabnik 4d9197efa8 Fix Draper spelling in Gemfile 2012-08-23 17:11:37 -07:00
Steve Klabnik f9ab136abd Misspelled Draper 
:)
 2012-08-23 17:01:30 -07:00
Robert Speicher af2e2e29b9 Remove unused minitest and turn gems 2012-08-23 19:21:55 -04:00
Robert Speicher 4adac4deba Move gitlab_meta gem to :production group 2012-08-23 19:21:20 -04:00
Robert Speicher 2c128f3874 Remove rails-footnotes gem and its related files 2012-08-23 19:20:28 -04:00
Cyril e2f19befbc fix inline forms 2012-08-23 23:04:43 +02:00
Dmitriy Zaporozhets 4b2e151fc6 Merge pull request #1283 from riyad/improve-gfm-code-docs 
Improve GFM code documentation
 2012-08-23 12:06:03 -07:00
Riyad Preukschas 32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
Dmitriy Zaporozhets 0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes 
Preview window is not closed after post
 2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets 07fe78b323 Merge pull request #1275 from tsigo/no_ci_simplecov 
Don't run SimpleCov on Travis
 2012-08-23 04:26:22 -07:00
Robert Speicher db4c3e58bc Don't run SimpleCov on Travis 2012-08-23 07:24:25 -04:00
Dmitriy Zaporozhets ed2b53cd1c Up to 2.8.1 2012-08-23 09:17:18 +03:00
Dmitriy Zaporozhets 7ab587a477 Merge pull request #1263 from dosire/merge_base_for_merge_request 
Show only the commits that are newer in the merge request.
 2012-08-23 00:32:37 -07:00
Dmitriy Zaporozhets a94b2d1ccf Fix meta gem version 2012-08-23 08:28:00 +03:00
Dmitriy Zaporozhets 6428d4dd63 gitlab_meta gem added 2012-08-23 08:15:30 +03:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar 
Allow disabling Gravatars in gitlab.yml settings
 2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets aa50408ecb 1. Better message if no ssh key 
2. SSH Keys Help page
 2012-08-22 03:56:53 +03:00
Dmitriy Zaporozhets 5c7ed6fa26 Up to 2.8 2012-08-22 01:15:26 +03:00
Sytse Sijbrandij 9ec4c2d214 Show only the commits that are newer in the merge request. 2012-08-21 23:07:11 +02:00
randx d1daeba173 Updated app:status & docs with hooks. Removed write_hooks from app:setup 2012-08-21 22:45:14 +03:00
Dmitriy Zaporozhets d862ebd3b3 Merge pull request #1266 from tsigo/cucumber_speedup 
Speed up the "Project Network Graph" cucumber feature
 2012-08-21 23:27:03 -07:00
Robert Speicher 6baf9c441d Fix cucumber failure that only happened on Travis 2012-08-21 22:48:15 -04:00
Robert Speicher 3095483e65 Speed up the "Project Network Graph" cucumber feature 
This change involves stubbing out the call to `Grit::Commit.find_all`
and limiting the number of commits to 10 vs. the standard of 650 used by
`Gitlab::GraphCommit.to_graph`.

Prior to this change, this single feature required almost 3 minutes of
running time and over 2 GB of memory on my machine. Now it takes less
than 3 seconds.
 2012-08-21 22:27:06 -04:00
randx 3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx 7fa6a23416 Better fonts for all code like wiki etc 2012-08-21 20:53:33 +03:00
randx 64f3682feb project should not respond to write_hooks any more 2012-08-21 20:24:04 +03:00
randx c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets 2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx 366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap 
Conflicts:
	app/models/user.rb
 2012-08-21 08:39:23 +03:00
Robert Speicher c5b13cc989 Remove more duplication in the Notify mailer 2012-08-20 23:18:57 -04:00
Robert Speicher 652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00
randx b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
Jakub Jirutka 335b3ed197 fix condition in find_for_ldap_auth 2012-08-20 12:58:03 +02:00
randx ccdea8b80d Fix dashboard random test fail 2012-08-19 12:14:36 +03:00
randx 8e3a2def8a Project /lib cleanup 2012-08-19 11:44:48 +03:00
randx d656cb74f7 Headless gem added 2012-08-19 11:36:37 +03:00
randx d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
randx 05c86fb0fc Specify charlock holmes version in installation docs 2012-08-19 10:20:42 +03:00