home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,225 Commits 48 Branches 340 Tags
faafde2d2b8dc3457c45aa87e6dd280bfdd13dde
Commit Graph
4422 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets faafde2d2b Fix new password page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 09:37:55 +02:00
Dmitriy Zaporozhets 9a3d665919 Show last commit for Blob#show 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 21:46:46 +02:00
Dmitriy Zaporozhets 657eb7ba93 Merge branch 'bug/filtering_service' into 'master' 
Fix wrong issues appears at Dashboard#issues page

Fixes #1028
 2014-02-10 18:52:08 +00:00
Dmitriy Zaporozhets 1794f606bd Use ace editor as gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 16:18:46 +02:00
Dmitriy Zaporozhets baf8afc6d3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-10 15:38:53 +02:00
Sytse Sijbrandij 6cf24ba9d7 Merge pull request #6284 from Razer6/fix_grammer_in_mr_page 
Fixes #6073, Update grammer in MR accept form
 2014-02-10 14:38:04 +01:00
Dmitriy Zaporozhets 58ac731c37 Fix Issues#bulk_update 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 15:36:58 +02:00
Dmitriy Zaporozhets 56f989e53e Fix wrong issues appears at Dashboard#issues page 
Filtering service used klass instead of passed items.
Because of this you see list of all issues intead of authorized ones.
This commit fixes it so people see only issues they are authorized to
see.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 15:04:52 +02:00
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
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
Robert Schilling 725d35edc2 Fixes #6073, Update grammer in MR accept form 2014-02-09 20:20:42 +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
dosire ea10424e0e Also change the description in the help. 2014-02-07 17:06:32 +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
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 0a3d50eb32 Fixed tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-06 16:17:33 +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
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
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 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
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
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 98fe8fb98d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-04 16:18:40 +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
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 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
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
brittlewis12 798360194a changed h3, h4 markdown font sizing to match markdown spec -- h3: 1.5em, h4: 1.2em 2014-01-31 11:46:52 -05:00
Marin Jankovski 468c9ce464 Allow issues to be viewed for authenticated user when project is public or internal. 2014-01-31 17:34:09 +01:00
Dmitriy Zaporozhets f416b2f5cf Fix bug with merge request branch select 
Merge request target branch select is broken if you submit form and have
some errors on page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:24:38 +02:00
Dmitriy Zaporozhets d47fb275ce Fix block/remove UI for admin::users#show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:04:14 +02:00
Jason Hollingsworth 25d93987d4 Fix shifting line numbers. 2014-01-30 19:18:59 -06:00