Commit graph

1294 commits

Author SHA1 Message Date
RickXing 25b80767bd use resque mailer to send mail background 2012-05-12 17:01:09 +08: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
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
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
Dmitriy Zaporozhets 7b7547aa00 Merge pull request #741 from mgesmundo/master
Cosmetic change in menu
2012-04-26 02:09:07 -07:00
mgesmundo 7c59722ddc Cosmetic change in menu 2012-04-26 11:55:46 +03:00
Valeriy Sizov f72a5d11bd Merge pull request #732 from mmozuras/ldap_name_utf8
Force utf-8 encoding for ldap omniauth_info.name
2012-04-24 13:59:27 -07:00
Dmitriy Zaporozhets 2746be6ce3 Home button should targeted on root page of context 2012-04-24 21:47:01 +03:00
gitlabhq b5fdacd153 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-24 17:52:10 +03:00
gitlabhq c9af8e7579 New project page improved. User profile improved. Show issues, participant on Milestone show page. 2012-04-24 21:49:34 +03:00
Dmitriy Zaporozhets bbb93de17f Merge pull request #704 from tader/workaround-charlock-holmes
Rescue from CharlockHolmes failures.
2012-04-24 03:55:03 -07:00
Thomas A. de Ruiter b53df22127 Rescue from CharlockHolmes failure 2012-04-24 12:43:06 +02:00
mmozuras 03cc55dba6 Force utf-8 encoding for ldap omniauth_info.name 2012-04-24 10:42:30 +03:00
Ariejan de Vroom af99e4afe1 Merge pull request #726 from kvs/patch-1
Fix very minor spelling issue.
2012-04-23 23:34:00 -07:00
Kenneth Vestergaard 01bb42ae02 Fix very minor spelling issue. 2012-04-23 17:41:15 +03:00
gitlabhq d97a9aa4a4 fixed email markdown 2012-04-23 15:32:56 +03:00
Ariejan de Vroom 21f3da2358 Make sure tmp/merge_repo is available to write lock files for auto-merge. 2012-04-23 10:54:19 +03:00
Dmitriy Zaporozhets 204c66461e corrected exception for automerge 2012-04-22 16:49:45 +03:00
Dmitriy Zaporozhets 511d07c47c Merge pull request #713 from gitlabhq/fast_automerge
Fast automerge
2012-04-22 06:38:39 -07:00
Valery Sizov e5f8397fd4 fast automerge: done 2012-04-22 16:14:01 +03:00
Dmitriy Zaporozhets 71819dc344 logo changed for header 2012-04-22 16:01:59 +03:00
Valery Sizov dcbb875c46 fast automerge: base implementation 2012-04-22 15:19:09 +03:00
Dmitriy Zaporozhets ae565d24ee Increased automerge timeout. Works for 300 commits MR on repo with 200MB size 2012-04-21 13:23:44 +03:00
Dmitriy Zaporozhets 7058258a2a Fixed db_schema & reordered rake tasks 2012-04-21 12:45:43 +03:00
Dmitriy Zaporozhets 08994f3f60 Merge remote-tracking branch 'origin/merge_button'
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets 9af14e4bda VERSION to 2.4.0 2012-04-21 12:15:17 +03:00
Dmitriy Zaporozhets 8d02d8c045 linguist gitlab fork 2012-04-21 01:48:03 +03:00
Dmitriy Zaporozhets 7c8fbe8f7f Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown 2012-04-21 01:44:52 +03:00
Dmitriy Zaporozhets 9cb51c6ea2 Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
Conflicts:
	Gemfile
	Gemfile.lock
2012-04-21 01:44:15 +03:00