home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,176 Commits 48 Branches 340 Tags
c0ec30aead795822d786cadeae496bb7ffb4b6ea
Commit Graph
8176 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c0ec30aead Merge branch 'link-to-recipies' into 'master' 
Link To Recipies

People can't find the CentOS / RHEL guide. Now that it follows the official guide I think we can link to it.
 2014-02-06 07:47:29 +00:00
Dmitriy Zaporozhets db5f0e7e88 Merge branch 'update_gitlab_grit' into 'master' 
Update gitlab-grit
 2014-02-06 07:20:02 +00:00
Dmitriy Zaporozhets 4f1c2386b3 Merge branch 'remove_ajax_gif' into 'master' 
Remove Ajax Gif
 2014-02-06 07:19:26 +00:00
Dmitriy Zaporozhets fc953eb162 Improve turbolink spinner 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 21:30:13 +02:00
Dmitriy Zaporozhets 268c183b29 Replace gif animation with font icon spinner 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 20:30:57 +02:00
Jacob Vosmaer 01a097d77a Update gitlab-grit 2014-02-05 18:49:16 +01:00
Dmitriy Zaporozhets 883409b941 Fixed commit align on dashboard feed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 19:19:46 +02:00
Dmitriy Zaporozhets f1402213db Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-05 18:57:35 +02:00
Dmitriy Zaporozhets 036cf6fce4 Merge branch 'gitlab_git_gem' into 'master' 
Use gitlab_git from rubygems
 2014-02-05 16:57:08 +00:00
Dmitriy Zaporozhets ea2a57cd99 Merge branch 'improve/compare_page' into 'master' 
Improve Compare page

Prevent Compare page timout for large amount of commits.
Fixes #989
 2014-02-05 16:55:36 +00:00
Sytse Sijbrandij 475864d542 Merge pull request #6252 from arruda/doc_fix 
Fixing comment about password in database docs
 2014-02-05 17:54:17 +01:00
Felipe Arruda Pontes 1d11a7fdd2 removing comment about changing the git user password for postgres, 
as discussed in #6248
 2014-02-05 14:31:15 -02:00
Dmitriy Zaporozhets 41b55d75f5 Use gitlab_git from rubygems 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 16:47:24 +02:00
Dmitriy Zaporozhets 2b592f29ce Merge branch 'minor_refactoring' into 'master' 
Minor refactoring

Add Repository#blob_at_branch method
 2014-02-05 14:22:50 +00:00
Dmitriy Zaporozhets a1a01254b9 Prevent 500 error on Compare page if diff read timout happens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 16:21:41 +02:00
Dmitriy Zaporozhets 8f88cbf06b Use MergeRequestDiff::COMMITS_SAFE_SIZE for Compare diff limit. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 16:09:13 +02:00
Dmitriy Zaporozhets 68249f23da Prevent Compare page timout for large amount of commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 15:54:51 +02:00
Dmitriy Zaporozhets 55572c4e86 Repository#blob_at_branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 11:39:55 +02:00
Dmitriy Zaporozhets d701d58695 Merge branch 'gitlab_git_rugged' into 'master' 
gitlab_git with rugged

Updated gitlab_git version with Blob via rugged
 2014-02-05 09:07:47 +00:00
dosire 665a2f6000 Remove duplication and link to CentOS guide. 2014-02-05 09:26:46 +01:00
Dmitriy Zaporozhets 10aa84bd74 Merge branch 'squashed-migrations' into 'master' 
Squashed migrations for 2011 and 2012
 2014-02-05 07:11:00 +00:00
Dmitriy Zaporozhets fc16a228c9 Fix blobs for file services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-05 09:02:13 +02:00
Dmitriy Zaporozhets 31987259e4 Fix markdown renderer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 19:14:36 +02:00
Dmitriy Zaporozhets da34e008c3 Merge pull request #5294 from dalehamel/master 
Ensure directory exists before changing in popen
 2014-02-04 07:21:35 -08:00
Dmitriy Zaporozhets 1080a9babd Merge pull request #6238 from athos-ribeiro/devise_unconfirmed_access 
Change Devise.confirm_within to Devise.allow_unconfirmed_access_for
 2014-02-04 07:20:16 -08:00
Dmitriy Zaporozhets e8f8abddb0 Squash migrations for years 2011 and 2012 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 17:11:30 +02:00
Dmitriy Zaporozhets 32b9ec50dd Merge branch 'architecture' into 'master' 
Architecture

Cleanup of architecture doc.
 2014-02-04 14:47:49 +00:00
Dmitriy Zaporozhets 98fe8fb98d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-04 16:18:40 +02:00
Dmitriy Zaporozhets f297c6b3d7 BUmp gitlab-git version (Blobs via rugged) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 16:05:14 +02:00
Dmitriy Zaporozhets 3a1c6cccc5 Merge branch 'bug/500_tag_name' into 'master' 
Fix 500 on tags page

Fix bug when grit parse tags wrong and raise exception on tags page.
Fixes #993
 2014-02-04 14:04:17 +00:00
dosire c296ecfb59 Remove duplication with readme. Remove unneeded spaces. Prevent people writing ~git in the documentation. Descriptive headers. 2014-02-04 14:49:06 +01:00
Dmitriy Zaporozhets 97a4d8aea4 Improve code according to new gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 14:46:15 +02:00
Dmitriy Zaporozhets bacfad1c65 Use new gitlab_git revision 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 14:45:04 +02:00
Dmitriy Zaporozhets 07157799c4 Merge branch '500-message' into 'master' 
500 Message
 2014-02-04 10:51:38 +00:00
dosire 3a48e1cfd1 Truthful wording. Fixes #934 2014-02-04 11:39:07 +01:00
Dmitriy Zaporozhets 6223a73fc2 Merge pull request #6231 from babatakao/markdown-for-snippets-in-projects 
Enable markdown formatting for snippets in projects.
 2014-02-04 01:29:54 -08:00
Athos Ribeiro 84408015cd Change Devise.confirm_within to Devise.allow_unconfirmed_access_for 
According to Devise's changelog
(https://github.com/plataformatec/devise/blob/master/CHANGELOG.md),
Devise.confirm_within was deprecated in favor of
Devise.allow_unconfirmed_access_for in version 2.0.0.
 2014-02-03 21:20:36 -05:00
Dmitriy Zaporozhets 5d871f1884 Fixed gitlab_git rev 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 19:53:54 +02:00
Dmitriy Zaporozhets edc18e777c Merge branch 'bug/filtering' into 'master' 
Bug in issue and merge request filtering

Fixes #1006
 2014-02-03 17:46:34 +00:00
Marin Jankovski 6a87daed76 Filter items by project. 2014-02-03 17:56:31 +01:00
Dmitriy Zaporozhets ca7e4a948b Use new tags/branches from gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 18:13:24 +02:00
Dmitriy Zaporozhets 5ec0955919 Use recent gitlab_git lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 18:12:51 +02:00
Takao BabaandTakao Baba c52bc838cd Enable markdown formatting for snippets in projects. 2014-02-04 01:06:21 +09:00
Marin Jankovski 4b0fb02816 Do not load all projects all the time. 2014-02-03 16:02:44 +01:00
Marin Jankovski 70fb26a6b7 Extract projects and mr into methods in features. 2014-02-03 13:59:20 +01:00
Dmitriy Zaporozhets c573265891 Merge pull request #6227 from jojosch/remove-python-doc 
remove remaining python references
 2014-02-03 03:05:01 -08:00
Johannes Schleifenbaum 7085892e47 remove remaining python references 2014-02-03 11:25:47 +01:00
Dmitriy Zaporozhets 6addb15b15 Bump gitlab_omniauth-ldap gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 09:45:42 +02:00
Marin Jankovski 75cecf36e0 Scenarios for checking if MR are shown for internal and public projects. 2014-02-02 16:32:12 +01:00
Marin Jankovski d40a7de170 Feature for visit issues page for internal project as auth user. 2014-02-02 00:59:48 +01:00