home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 05ab4d8ba3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-10 13:02:53 +02:00
Dmitriy Zaporozhets bed05a1381 Fix submodule_helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 13:02:26 +02:00
Sytse Sijbrandij e26c7f7767 Merge pull request #6280 from bovi/patch-1 
Minor README fix
 2014-02-10 11:45:00 +01:00
dosire 7b33efdf5e More than text was missing a word on the help page. 2014-02-10 11:44:27 +01:00
Dmitriy Zaporozhets dee11dadad Fix submodules 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 09:55:38 +02:00
Dmitriy Zaporozhets 8b6a14b505 Bump for gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 09:36:31 +02:00
Robert Schilling 725d35edc2 Fixes #6073, Update grammer in MR accept form 2014-02-09 20:20:42 +01:00
Robert Schilling 898d4fe37d Fixes #6187, Update dead links 2014-02-09 18:53:06 +01:00
Daniel Bovensiepen b99adc9b9a Minor README fix 
I guess it should be "...*more* than 50,000"
 2014-02-09 20:04:15 +08:00
robertd acf209bc53 Update changelog for #6267 2014-02-08 17:24:49 -07: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
Robert Djurasaj ff45c9755f Update upgrade guide if you have more than one backup .tar file 2014-02-06 12:20:23 -07:00
skv 7a8f0019cf Replace badge to labels, because twbs3 doesn't supprot colored badges 2014-02-06 22:16:47 +04:00
Andrew Kumanyaev e139cc9e33 Add emoji images to asset load path. 2014-02-06 19:56:47 +03: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
Devaroop Bhattacharya 42083b19ae update manual error in changelog while merging 2014-02-06 20:31:27 +05:30
Devaroop Bhattacharya 5101ff7bec Update Gemfile.lock 2014-02-06 19:53:29 +05:30
Devaroop Bhattacharya 16d6eb3f9a Update Gemfile 2014-02-06 19:51:31 +05:30
Dmitriy Zaporozhets 0a3d50eb32 Fixed tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 16:17:33 +02:00
GitLab b1492a2a62 sync with upstream for ease to merge 2014-02-06 19:47:21 +05:30
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
GitLab 319f355aed merge with upstream master 2014-02-06 16:56:20 +05:30
GitLab 1c9a41e0d5 adding tests for the ssh keys feature 2014-02-06 14:42:59 +05:30
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