home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,268 Commits 48 Branches 340 Tags
5b0aa252ad052d0c1f1d9699b62271c40935d5cd
Commit Graph
4448 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 5b0aa252ad Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-12 09:12:31 +02:00
Dmitriy Zaporozhets 8de11d88eb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-12 09:03:24 +02:00
Dmitriy Zaporozhets 331d957625 Merge branch 'asset-path-in-scss' into 'master' 
Use rails scss image-url herlper
 2014-02-12 06:55:26 +00:00
Sytse Sijbrandij de0abc0b42 Merge branch 'fix-projects-spelling' into 'master' 
Fix spelling of plural project (projects and not project's).

Just a minor spelling error.
 2014-02-11 19:35:27 +00:00
Dmitriy Zaporozhets 1bcf0aa2e6 Merge pull request #6297 from jojosch/user-public-ssh-keys-newline 
Split the user ssh keys by newline, not the characters "\n"
 2014-02-11 21:07:52 +02:00
Dmitriy Zaporozhets d39948a8d0 Restore old padding for wiki blocks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 21:03:43 +02:00
Dmitriy Zaporozhets c61512d4e1 Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into cirosantilli-header-anchors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-02-11 20:32:21 +02:00
Dmitriy Zaporozhets 6e47fbf5d9 Merge branch 'bug/gravatr_select2' into 'master' 
Dont use gravatars for user select if gravatar is disabled

Fixes #836
 2014-02-11 18:28:21 +00:00
Johannes Schleifenbaum f10153818b Split the user ssh keys by newline, not the characters "\n" 
before:
GET /user.keys

ssh-rsa ...\nssh-rsa ...\nssh-rsa ...

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...
 2014-02-11 19:24:23 +01:00
Dmitriy Zaporozhets 39aeac71b3 Merge pull request #6177 from cirosantilli/public-user-pages 
User pages are public
 2014-02-11 18:43:03 +02:00
Dmitriy Zaporozhets aef782888f Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh 
ssh keys publically available for sysadmins via http, the github way
 2014-02-11 18:41:10 +02:00
Ciro Santillli 61748c993d Headers have ids and link to their own id. 2014-02-11 16:23:33 +01:00
Ciro Santillli 91571c078d User pages are visible to users without login 
... if the user is authorized to at least one public project.
 2014-02-11 15:45:30 +01:00
Dmitriy Zaporozhets 3b8b396ccd Use rails image-url herlper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 16:05:36 +02:00
Dmitriy Zaporozhets 348e44ef06 Dont use avatars for user select if avatar is disabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 15:49:39 +02:00
GitLab 46ad09bf70 code refactor as per standards 2014-02-11 19:04:47 +05:30
Dmitriy Zaporozhets 9e6f4d3614 Merge pull request #6087 from pgolm/fix/link_to_merge_request_diff_line_note 
fix: link_to_merge_request_diff_line_note
 2014-02-11 15:32:44 +02:00
Dmitriy Zaporozhets 0b0ba8be7f Merge pull request #6249 from babatakao/fix_500_in_ruby19 
Fix 500 error in Ruby 1.9.
 2014-02-11 13:52:49 +02:00
Pixelindustries 9d3d0a9e18 Fix spelling of plural project (projects and not project's). 2014-02-11 10:03:44 +01:00
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
GitLab b1492a2a62 sync with upstream for ease to merge 2014-02-06 19:47:21 +05:30
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
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