home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,197 Commits 48 Branches 340 Tags
898d4fe37d6461daf5b4e2c31620cf9e11e682f0
Commit Graph
8197 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling 898d4fe37d Fixes #6187, Update dead links 2014-02-09 18:53:06 +01:00
Dmitriy Zaporozhets 54b8921534 Merge branch 'feature/submodule-links' into 'master' 
Better submodule links

Detect if submodule is hosted on this GitLab server, gitlab.com or github.com.
Hash links directly to commit in repo.
 2014-02-08 19:47:11 +00:00
Dmitriy Zaporozhets 803ba84c6b Merge pull request #6261 from skv-headless/badge_to_labels 
Replace badge to labels, because twbs3 doesn't supprot colored badges
 2014-02-08 14:23:10 +02:00
Dmitriy Zaporozhets 540da508ff Merge pull request #6267 from robertd/feature-groups-on-profile-screen 
Show avatars of groups on profile screen that user belongs to
 2014-02-08 14:21:51 +02:00
robertd 973066e76d Add tests for groups avatars check on user page 2014-02-07 22:45:46 -07:00
Dmitriy Zaporozhets 2f82035f2c Merge branch 'better-description-and-50k' into 'master' 
Better Description And 50k
 2014-02-07 17:53:11 +00:00
dosire ea10424e0e Also change the description in the help. 2014-02-07 17:06:32 +01:00
dosire e772da0c1e Uniform description. 2014-02-07 17:03:36 +01:00
Dmitriy Zaporozhets 65d3438861 Merge branch 'bug/noteable_id' into 'master' 
Fix bug with cross-reference note on commit

Fixes #1018
 2014-02-07 11:36:08 +00:00
Dmitriy Zaporozhets c03df58e9e Fix turbolink-spinner for light theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-07 12:41:31 +02:00
Dmitriy Zaporozhets 4ecf30cd5b Fix bug with cross-reference note on commit 
It should not set noteable_id if noteable_type is Commit
We have Note#commit_id for this

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-07 12:34:30 +02:00
Dmitriy Zaporozhets eb2f3a8044 More entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-07 09:45:03 +02:00
robertd b8e81e558f Show avatars of groups on profile screen that user belongs to 2014-02-06 23:27:32 -07:00
skv 7a8f0019cf Replace badge to labels, because twbs3 doesn't supprot colored badges 2014-02-06 22:16:47 +04:00
Dmitriy Zaporozhets 1759214fcc Add group avatar to CHANGELOG 2014-02-06 16:32:03 +00:00
Dmitriy Zaporozhets f7b46fa5ff Merge branch 'improve/tab_names' into 'master' 
Add icons and better names to Project/Group nav
 2014-02-06 16:29:52 +00:00
Dmitriy Zaporozhets 0a3d50eb32 Fixed tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 16:17:33 +02:00
Dmitriy Zaporozhets 90ab30b74b Fix encoding issues after gitlab_git 5.1.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 16:03:32 +02:00
Dmitriy Zaporozhets eb272227c3 Add icons and better names to Project/Group nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 10:16:26 +02:00
Dmitriy Zaporozhets f99ee99f65 Better color for nav links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 09:51:39 +02:00
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
Jason Hollingsworth fcc906e6aa Better submodule links. 
Detect if submodule is hosted on this GitLab server, gitlab.com or github.com.
Hash links directly to commit in repo.
 2014-02-05 20:44:14 -06: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