home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,287 Commits 48 Branches 340 Tags
71a39655b4ce1e66b4e2a7fc8ffa36fbc06901c6
Commit Graph
8287 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 71a39655b4 Merge pull request #6258 from zzet/patch-6 
Add emoji images to asset load path.
 2014-02-13 14:59:33 +02:00
Dmitriy Zaporozhets d41e404e09 Merge pull request #6274 from cirosantilli/leave-group-from-members-page 
User can leave group from group page.
 2014-02-13 09:44:03 +02:00
Marin Jankovski bccc2729ef Update minor version upgrade guide get latest code section. 2014-02-12 17:42:56 +01:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
Dmitriy Zaporozhets 0949c01093 Merge branch 'markdown-styles' into 'master' 
Markdown Styles
 2014-02-12 14:00:09 +00:00
dosire 36462d77b5 Markdown styles dependencies are optional. 2014-02-12 14:49:31 +01:00
Dmitriy Zaporozhets 80f34cfbc7 Merge branch 'remove-gem-button' into 'master' 
Remove Gem Button
 2014-02-12 13:10:20 +00:00
dosire 0e90ff8018 Gemnasium makes us red even though we are not exposed to a JRuby bug. 2014-02-12 14:02:50 +01:00
Dmitriy Zaporozhets c86553cd83 Merge branch 'refactor_compare' into 'master' 
Refactor Compare logic

Updated gitlab_git to version 5.4.0.
Fixes MR diff download link in case of huge diff.
Fixes #1026
 2014-02-12 12:51:35 +00:00
Dmitriy Zaporozhets ddbb3c3016 Merge branch 'markup-dependencies' into 'master' 
Markup Dependencies
 2014-02-12 11:05:14 +00:00
Dmitriy Zaporozhets 70df605535 Fix link for MR diff download 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 13:03:32 +02:00
Dmitriy Zaporozhets 59769fdb94 Improve compare logic for EmailOnPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 12:56:13 +02:00
Dmitriy Zaporozhets 0bcabdaf83 Use gitlab_git 5.4.0 without BROKEN_DIFF constant 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 12:54:49 +02:00
dosire abb6204de8 Add information about rich text format dependencies. 2014-02-12 09:45:34 +01:00
Dmitriy Zaporozhets bb44a7a25d Merge pull request #6298 from ralish/hipchat-spelling-fix 
Fix spelling of "GitLab" in HipChat service
 2014-02-12 09:43:02 +02:00
Dmitriy Zaporozhets 168e0341a3 Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions 
add rake gitlab:import: all_users_to_all_groups and user_to_groups
 2014-02-12 09:40:40 +02:00
Samuel D. Leslie a5c62585a9 Fix spelling of "GitLab" in HipChat service 
Pedantic, but it frustrates OCD people like myself :)
 2014-02-12 18:27:00 +11:00
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