home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,268 Commits 48 Branches 340 Tags
5b0aa252ad052d0c1f1d9699b62271c40935d5cd
Commit Graph
8268 Commits
This Branch
This Branch
All Branches
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
GitLab 4b9c28bccd remove unwanted spaces, reduce diff, clean before merge 2014-02-11 21:12:27 +05:30
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 1739b7fcbb Merge branch 'retrieve_ssh_keys_by_ssh' of github.com:devaroop/gitlabhq into retrieve_ssh_keys_by_ssh 2014-02-11 19:05:27 +05:30
GitLab 46ad09bf70 code refactor as per standards 2014-02-11 19:04:47 +05:30
Dmitriy Zaporozhets 1284f21c07 Merge pull request #6264 from robertd/update_upgrade_guide 
Update upgrade guide if you have more than one backup .tar file
 2014-02-11 15:33:06 +02:00
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
Marin Jankovski 441e6dcf0d Update api project documentation to include project name as attribute. 2014-02-11 11:44:08 +01:00
Dmitriy Zaporozhets e1c1e882b3 Merge branch 'layout-of-upgrader' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/update/upgrader.md
 2014-02-11 11:10:01 +02:00
Dmitriy Zaporozhets 5966f5bb97 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-11 11:07:44 +02:00
dosire f1da402be7 Require a full yes. 2014-02-11 10:06:25 +01:00
Pixelindustries 9d3d0a9e18 Fix spelling of plural project (projects and not project's). 2014-02-11 10:03:44 +01:00
Dmitriy Zaporozhets 51ed906d9d Merge branch 'we-hate-options' into 'master' 
We Hate Options
 2014-02-11 09:02:46 +00:00
Sytse Sijbrandij 345694384e Merge pull request #5975 from terrywang/fix-update-doc 
Fix numbering in 6.3-to-6.4.md
 2014-02-11 09:55:23 +01:00
dosire 41adbc0b94 We do not like configuration options. 2014-02-11 09:53:07 +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 1af84f8ceb Merge branch 'feature/blob_last_commit' into 'master' 
Feature: show last commit for Blob#show

Fixes #970
 2014-02-10 20:57:43 +00: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 35fb7d5408 Merge pull request #6276 from robertd/update_changelog 
Update changelog for #6267
 2014-02-10 21:09:53 +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 c10a35c4ad Merge branch 'ace_editor' into 'master' 
Ace Editor as gem
 2014-02-10 17:12:49 +00:00
Dmitriy Zaporozhets 5e30f4d54c Fix dashboard atom feed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 17:32:36 +02: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
Dmitriy Zaporozhets 8342f73de8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-10 15:38:44 +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
Sytse Sijbrandij 189ae623ca Merge pull request #6283 from Razer6/fix_dead_links 
Fixes #6187, Update dead links
 2014-02-10 14:37:32 +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 ec437ad999 Add more tests for FilteringService 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 15:23:19 +02:00
Sytse Sijbrandij 62778fa758 Merge branch 'sockets_are_standard' into 'master' 
Sockets Are Standard
 2014-02-10 13:06:24 +00: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
Jacob Vosmaer 464d820bc5 Domain sockets are the default, not TCP 2014-02-10 14:01:15 +01:00
Jacob Vosmaer e009e0203e Use one sentence per line in architecture.md 2014-02-10 13:59:30 +01:00
Dmitriy Zaporozhets 5a098e84e4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-10 13:03:24 +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