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

1569 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dmitriy Zaporozhets be79c9def9 CSS improvements for diff & file view 2012-05-15 19:35:18 +03:00
Dmitriy Zaporozhets a27ee18428 Merge pull request #823 from kugaevsky/main_menu_styles 
CSS fix: main menu buttons dividers
 2012-05-15 08:41:05 -07:00
Nick Kugaevsky 6a4ae93f57 CSS fix: main menu buttons dividers 2012-05-15 18:50:27 +04:00
Dmitriy Zaporozhets 81a89f6a83 Merge pull request #822 from kugaevsky/activity_stream 
Activity stream labels css fix
 2012-05-15 07:13:06 -07:00
Nick Kugaevsky 451118f19a Activity stream: event labels css fix — proper paddings. 2012-05-15 17:47:01 +04:00
Nick Kugaevsky 7406fb5b12 Activity stream: commit labels css fix — proper paddings and highlighting on hover. 2012-05-15 17:46:18 +04:00
Dmitriy Zaporozhets fab42a612e Merge pull request #814 from kugaevsky/patch-1 
Minor headers styles in readme fix: increased line-height for h1..h4.
 2012-05-15 01:08:30 -07:00
Dmitriy Zaporozhets 17bd6b13bc Merge pull request #821 from oreofish/showmarkdown 
show rendered file if it is .markdown file
 2012-05-15 00:18:49 -07:00
Dmitriy Zaporozhets e84411ef33 Merge pull request #820 from robbkidd/add_missing_call_to_find 
Fix bug: missing call to MergeRequest.find in Notify#changed_merge_request_email
 2012-05-15 00:17:44 -07:00
RickXing 465a195117 show rendered file if it is .markdown file 2012-05-15 09:23:14 +08:00
Robb Kidd e0b709266e Fix missing call to MergeRequest.find in Notify#changed_merge_request_email 2012-05-14 20:19:28 -04:00
Dmitriy Zaporozhets 65382133d5 Merge pull request #761 from michaeltrimm/patch-1 
Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that...
 2012-05-13 08:20:14 -07:00
Valeriy Sizov b5d5ecd155 Merge pull request #812 from bgondy/patch-1 
Adding sudo before sudo rm -rf /tmp/gitolite-admin (privileges needed)
 2012-05-12 22:50:57 -07:00
Dmitriy Zaporozhets dd79dba804 Merge pull request #809 from robbkidd/spec_protected_branch 
Add spec for ProtectedBranch.
 2012-05-12 11:31:12 -07:00
Dmitriy Zaporozhets e81ba7b249 Fixed Gemfile.lock 2012-05-12 21:17:42 +03:00
Dmitriy Zaporozhets 39504aa19b Merge branch 'resquemailer' of https://github.com/oreofish/gitlabhq into oreofish-resquemailer 
Conflicts:
	Gemfile.lock
 2012-05-12 21:02:13 +03:00
Nick Kugaevsky c0fa68572e Minor headers styles in readme fix: increased line-height for h1..h4. 2012-05-12 16:50:57 +04:00
RickXing 25b80767bd use resque mailer to send mail background 2012-05-12 17:01:09 +08:00
bgondy 6e3db9a501 Adding sudo before sudo rm -rf /tmp/gitolite-admin (root privileges needed) 2012-05-12 01:42:16 +03:00
Valeriy Sizov 0a3874f6a3 Merge pull request #807 from robbkidd/update_the_gems 
Updated gems. Specs all still pass. (Devise pinned to 1.x)
 2012-05-11 00:54:51 -07:00
Valeriy Sizov 027524283b Merge pull request #808 from robbkidd/mr_text_column_size_increase_in_schema.rb_too 
Add to schema.rb the increased MR text column size.
 2012-05-11 00:47:02 -07:00
Robb Kidd d50446088c Add spec for ProtectedBranch. 2012-05-10 22:43:12 +00:00
Robb Kidd 00b4c4571c Add to schema.rb the increased MR text column size. 
This change was made in a migration in commit 17a88bb6a2.
Because the schema.rb is checked in, the column size increase should
be here, too.
 2012-05-10 21:54:22 +00:00
Robb Kidd d0eaca919b Updated gems. Specs all still pass. (Devise pinned to 1.x) 
Pinned devise to the 1.x series for the moment. Going to 2.0 threw
deprecation warnings about:
* Devise.stateless_token= (append :token_auth to Devise.skip_session_storage instead)
* devise.registrations.reasons in yml (use devise.registrations.signed_up_but_REASON)
 2012-05-10 21:46:07 +00:00
Valeriy Sizov 9e5c016847 Merge pull request #800 from zx1986/patch-1 
in /etc/init.d/gitlab, I add "-l" option in sh command
 2012-05-10 02:48:43 -07:00
張旭 8272354288 in /etc/init.d/gitlab, I add "-l" option in sh command 2012-05-09 17:46:42 +08:00
Valeriy Sizov 58640f93aa Merge pull request #794 from SaitoWu/master 
update launchy to fix an NoMethodError on development and test mode
 2012-05-07 03:42:33 -07:00
Valeriy Sizov ff284b2689 Update .travis.yml 2012-05-07 13:15:09 +03:00
Saito fbf108262d update launchy to fix an nomethod error on development and test mode 2012-05-07 10:55:57 +08:00
Victor Ilyukevich 447fe38479 removing /tmp/gitolite-admin in installation script with sudo 2012-05-04 14:31:16 +03:00
Valeriy Sizov d36454cda5 Merge pull request #785 from prydonius/spelling_mistake 
spelling mistake 'successfull'
 2012-05-04 02:47:19 -07:00
Adnan Abdulhussein f20c079375 spelling mistake 'successfull' 2012-05-03 20:35:15 +01:00
Valeriy Sizov 12bb1d8f39 Merge pull request #775 from netdata/gravatar_empty_issue 
When the email address is empty gitlab will give a 500 error
 2012-05-03 06:19:49 -07:00
Valeriy Sizov 28bc6c5247 Merge pull request #777 from netdata/Show_better_permissions_overview 
Make permission overview structured
 2012-05-03 06:17:37 -07:00
Valeriy Sizov 1db3228c33 Merge pull request #778 from netdata/Allow_short_project_names 
Allow short project names
 2012-05-03 06:15:59 -07:00
Wouter D'Haeseleer babb6a1a6b Define a default value as suggested by ariejan 2012-05-03 14:19:06 +02:00
Wouter D'Haeseleer c808295e9e Allow short project names 
We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...
 2012-05-03 12:53:24 +02:00
Wouter D'Haeseleer edcbe1178c Make permission overview structured 
The current overview is a mess.
This pull commit will make it look more clean.

All permissions are alliged between the columns and the master rights
have been enchanced with all its rights.
 2012-05-03 12:44:03 +02:00
Wouter D'Haeseleer 825d2d69af When the email address is empty gitlab will give a 500 error 
Since some conversion tools do commits with an empty commiters email
address gitlab will fail with a 500 error
 2012-05-03 12:20:27 +02:00
michaeltrimm b8c69c6f34 Fixed a bug in the bundle exec rake db:migrate RAILS_ENV=production that causes the rake to fail and the system not properly install the default user and password. 2012-04-30 11:33:00 -03:00
Ariejan de Vroom 2176e2c915 Try running against 1.9.3 again. 2012-04-30 00:45:01 +03:00
Zevs f18339c26d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-30 00:24:59 +03:00
Zevs c937d06c3c Task#755 auto-merge don`t work correctly. 2012-04-30 00:23:19 +03:00
Valeriy Sizov 35e602f19c small fix installation`s guide. 2012-04-29 10:39:15 +03:00
Valery Sizov 903f9491ba MR: change path to lock file 2012-04-27 01:09:23 +03:00
Valery Sizov ff8136cda2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-27 00:55:26 +03:00
Valery Sizov 43dcc9575a Task #735 Automerge should not be checked on every load of MR show page 2012-04-27 00:53:55 +03:00
Dmitriy Zaporozhets 28cb43135c Hooks UI improved, Request tests added 2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets 91bd8fc907 Merge pull request #743 from qqshfox/fix_issue_742 
fix #742
 2012-04-26 04:05:09 -07:00
Hanfei Shen c71222ba9e fix #742 2012-04-26 19:00:29 +08:00