Commit graph

1138 commits

Author SHA1 Message Date
randx 464cd59dff Rake task to provider full repo access for gitolite-owner.\n Automerge requires gitlab user be able to push to any repo 2012-03-30 08:25:04 +03:00
randx 3824f9b372 Unverify MR on every push. Ajax for MR accept. better UI 2012-03-30 08:15:04 +03:00
randx 411d84f385 Better merge handling. show if MR can be accepted or not 2012-03-30 08:05:04 +03:00
Dmitriy Zaporozhets cd74f9da91 Link for auto merge, db field for MR 2012-03-30 00:27:42 +03:00
randx 78d620b3b6 Raw gitlab automerge feature 2012-03-29 18:03:05 +03:00
Dmitriy Zaporozhets 8ee0993fdf Event & Wiki models specs 2012-03-28 22:53:45 +03:00
Dmitriy Zaporozhets ef32e01b4c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-28 19:31:09 +03:00
randx 69ef81404c UI improved, .main_box css class for show pages 2012-03-28 10:46:51 +03:00
randx 88d9569a33 Project model refactored. Modularity gem 2012-03-28 10:44:51 +03:00
Ariejan de Vroom d706805c00 Added info on MySQL; Fixed formatting and language. 2012-03-28 10:07:24 +03:00
Dmitriy Zaporozhets bae4efa7cf Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-03-28 00:31:22 +03:00
Dmitriy Zaporozhets 46906ca9db Issues, Merge Request show page polished. Fixed +n overflow 2012-03-28 00:31:14 +03:00
Valery Sizov 671424a8e7 installation guide: change link to script of auto-install 2012-03-27 23:15:09 +03:00
Valeriy Sizov 27cd6c758d Merge pull request #585 from patthoyts/pt/omniauth-config
Move OmniAuth configuration details into a non-revision controlled file.
2012-03-27 13:13:07 -07:00
Valery Sizov cfe8676594 added script for auto install 2012-03-27 23:11:14 +03:00
Valeriy Sizov 341b6d546b Merge pull request #586 from patthoyts/pt/ldap-auth-fix
Ensure LDAP provided email is always compared case-insensitively.
2012-03-27 13:09:06 -07:00
Valery Sizov 1bb804da7f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-27 23:04:45 +03:00
Valery Sizov 442d5dbef2 fixed yellow background in markdown documents 2012-03-27 23:04:21 +03:00
Ariejan de Vroom 474a42cfbd Only load MySQL2Adapter connection fix is MySQL2 is available.
Useful for Sqlite or Postgres installations.
2012-03-27 16:59:25 +03:00
Ariejan de Vroom 4b96907e7c Merge pull request #603 from yvmarques/patch-1
Changed for mysql2 adapter
2012-03-27 06:46:27 -07:00
Yvan 2519ecf686 Changed for mysql2 adapter 2012-03-27 16:42:23 +03:00
Ariejan de Vroom 3b4e7b315b Added fix for "MySQL has gone away" errors with Resque workers. 2012-03-27 15:17:23 +02:00
Dmitriy Zaporozhets 1647f46b1f Project show page polished 2012-03-26 23:11:15 +03:00
Dmitriy Zaporozhets 788de6f1c8 Better commit show page 2012-03-26 22:41:56 +03:00
Dmitriy Zaporozhets 7d56a51bdc Js refactoring and ajax animation replaced 2012-03-26 21:41:58 +03:00
Dmitriy Zaporozhets f1c534c68e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-26 20:30:06 +03:00
Dmitriy Zaporozhets fc49b20194 Merge pull request #595 from goshakkk/texting-fixes
Texting issues fix
2012-03-26 02:25:40 -07:00
Gosha Arinich 73404f6281 there should be no space after '(' and before ')' 2012-03-26 12:11:02 +03:00
randx dfe9f3674c fix image width for markdown 2012-03-26 07:40:51 +03:00
Dmitriy Zaporozhets 39ea486e1f Fixed specs. Some css fixes 2012-03-25 19:44:29 +03:00
Dmitriy Zaporozhets 8652cd8989 Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit. 2012-03-25 19:05:24 +03:00
Dmitriy Zaporozhets b1d89f732c Merge branch 'master' of https://github.com/dubcanada/gitlabhq into dubcanada-master 2012-03-25 17:04:07 +03:00
Dmitriy Zaporozhets d07f8510c8 Merge pull request #592 from paularmstrong/bug/install-doc
Fix installation instructions for running gitlab_status
2012-03-25 02:02:16 -07:00
Paul Armstrong fd1e7e2b21 Fix instructions for running gitlab_status
When running `rake gitlab_status` to check if it's safe to continue on installation in step 4, you need to use `RAILS_ENV=production` or else you will receive an error about "permission denied for user root@localhost..."
2012-03-24 16:07:21 -07:00
Steven Verbeek 3c9a18a0bf Forgot others for border radius 2012-03-24 18:31:01 -03:00
Steven Verbeek 54dc2d5c32 Changed Note to Comment 2012-03-24 18:19:26 -03:00
Steven Verbeek d3cb694edb Fixed icon, added helper 2012-03-24 14:42:45 -03:00
Steven Verbeek c359db3852 Removed thumbs.db 2012-03-24 14:38:10 -03:00
Steven Verbeek a805d3131f Fixed line ending issues on windows. 2012-03-24 14:36:14 -03:00
Steven Verbeek 27244e0c9e Fixed line ending issues on windows. 2012-03-24 14:01:38 -03:00
Steven Verbeek c2c4424ff8 Started note attachment changes, and text changes 2012-03-24 13:57:01 -03:00
Steven Verbeek 597afb7ce2 Started note attachment changes, and text changes 2012-03-24 13:53:16 -03:00
Steven Verbeek e5fa0bb127 Started note attachment changes, and text changes 2012-03-24 13:40:21 -03:00
Steven Verbeek fb4c033aeb Started note attachment changes, and text changes 2012-03-24 13:30:04 -03:00
Steven Verbeek b91128cc6a Started note attachment changes, and text changes 2012-03-24 13:26:25 -03:00
Steven Verbeek 194467b8f8 Started note attachment changes, and text changes 2012-03-24 13:19:20 -03:00
Steven Verbeek 46605c9175 Started note attachment changes, and text changes 2012-03-24 13:08:42 -03:00
Ariejan de Vroom 1fd080687d Merge pull request #588 from tvlooy/patch-2
See https://github.com/gitlabhq/gitlabhq/issues/572
2012-03-24 02:44:03 -07:00
Tom Van Looy 51ab128337 See https://github.com/gitlabhq/gitlabhq/issues/572 2012-03-24 08:38:32 +01:00
Steven Verbeek 6c40e89853 merging upstream changes 2012-03-24 00:36:54 -03:00