home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +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 7ee53643cf Fix commit pagination 2013-07-06 10:58:33 +03:00
wuweixin 2c7b0d5a46 fix bug when project named: mediawiki 
mediawiki.wiki.git
mediawiki.git

/.wiki$/ match awiki, so when your project named mediawiki
it will be find project named: "medi"

use /\.wiki$/ fix this bug
 2013-07-06 09:31:56 +08:00
Dmitriy Zaporozhets 96448d1b7b Fix shortcuts popup 2013-07-05 15:19:31 +03:00
Dmitriy Zaporozhets 5067e9dc88 Minor UI improve for dashboard events 2013-07-04 17:10:34 +03:00
Dmitriy Zaporozhets 5f0b50db7a Discover default branch on project creationg 2013-07-04 14:32:02 +03:00
Yves Senn cab2ba0af3 Merge pull request #4476 from tstone2077/master 
Updating documentation to reflect #3836 (resolving #4443)
 2013-07-04 04:28:53 -07:00
Dmitriy Zaporozhets d0f3e993c5 Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq 2013-07-04 11:08:33 +00:00
Jacob Vosmaer ae9e4a52c5 Add cluster mode instructions to puma.rb.example 2013-07-04 11:14:03 +02:00
Dmitriy Zaporozhets 2233f2e020 Merge pull request #4484 from Razer6/add_services_to_blacklist 
Add 'services' to path blacklist
 2013-07-03 12:03:39 -07:00
Yves Senn 3edca5d822 Merge pull request #4488 from dekimsey/patch-1 
Fix misspelling in social accounts tip
 2013-07-03 10:43:50 -07:00
dekimsey b8f51acf7b Fix misspelling in social accounts tip 2013-07-03 13:34:23 -04:00
Dmitriy Zaporozhets 44ac961b8d group filter from dashboard. Design improvements of dashboard 2013-07-03 20:10:27 +03:00
Robert Schilling 702dc30448 Add 'services' to path blacklist, fixes #4470 2013-07-03 12:57:35 +02:00
Yves Senn d6ab5ad306 Merge pull request #4482 from kivlor/patch-1 
move 'make config/database.yml readable to git only' instruction
 2013-07-03 00:00:14 -07:00
Andrew Gallagher 0c4fd05d72 move 'make config/database.yml readable to git only' instruction 
I've moved the instruction in question to the the 
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist 😉
 2013-07-03 15:15:50 +10:00
Dmitriy Zaporozhets 3802ae0cfa Prevent tree log crash if commit missing 2013-07-02 14:26:13 +03:00
Dmitriy Zaporozhets 15bc1223c7 Work on themes a bit 2013-07-02 14:06:25 +03:00
Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev 
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
 2013-07-02 11:47:09 +03:00
Dmitriy Zaporozhets 7588186e81 Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq 2013-07-02 08:43:40 +00:00
Dmitriy Zaporozhets 66e10f0566 Fix header avatar 2013-07-02 11:42:39 +03:00
Dmitriy Zaporozhets 47f78a2c76 Merge pull request #4440 from jackbot/editable-notes 
Editable notes
 2013-07-02 01:41:28 -07:00
Jacob Vosmaer 9e86f3b156 Warn that relative URL's are unsupported 2013-07-02 10:27:51 +02:00
GitLab 015d8da731 Updating documentation to reflect #3836 (resolving #4443) 2013-07-01 21:14:39 -05:00
Dmitriy Zaporozhets f49fb5dca1 Fix error when reassign issue/merge_request from non-assigned. Fixes #3201 2013-07-01 19:01:19 +03:00
Dmitriy Zaporozhets ef9298febb Merge branch 'feature/shortcuts' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev 2013-07-01 15:43:35 +00:00
Jack Weeden 6fa06893e9 Add editable notes feature 2013-07-01 10:48:25 +01:00
Jack Weeden af81ff4e09 Changed 'javascript:;' links to '#' 2013-07-01 10:48:02 +01:00
Jack Weeden 22c00e6462 Removed before_filter as authentication is done within update method 2013-07-01 10:48:02 +01:00
Jack Weeden 1216a62e3b Authorize user on note update 2013-07-01 10:48:02 +01:00
Jack Weeden 20b2a0b235 Ability to edit comments 2013-07-01 10:48:02 +01:00
Jack Weeden b62c9e5991 Prevent 'toplevel constant SnippetsController referenced by Project::SnippetsController' warning 2013-07-01 10:48:01 +01:00
Jack Weeden 6a84d92672 Added update and delete_attachment actions to note controller 2013-07-01 10:47:39 +01:00
Jack Weeden 5ffc90d90d Merge remote-tracking branch 'upstream/master' 2013-07-01 10:43:01 +01:00
Dmitriy Zaporozhets 6e550af150 Show shotcut dialog on ? 2013-06-30 22:10:52 +03:00
Dmitriy Zaporozhets 315d4cc8e8 Merge pull request #4415 from jackbot/master 
Couple of UI additions
 2013-06-30 09:32:47 -07:00
Dmitriy Zaporozhets 9b181dc649 Merge pull request #4442 from 1ed/projects-helper-fix 
fixed nav bar for empty repos (fixes #4375)
 2013-06-30 09:32:04 -07:00
Dmitriy Zaporozhets 0f84833c33 Remove capistrano files since its very problematic to deploy gitlab with it 2013-06-30 19:19:06 +03:00
Dmitriy Zaporozhets a54f2d512a Update gitlab_git version 2013-06-30 19:14:27 +03:00
Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev 
Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml
 2013-06-30 11:35:40 +03:00
Dmitriy Zaporozhets d9c02f30e5 Merge pull request #4460 from tstone2077/feature_help_markdown 
Adding detailed documentation of the markdown syntax.
 2013-06-30 01:22:21 -07:00
Dmitriy Zaporozhets c7da44d6d1 Fixed db/schema.rb 2013-06-30 11:20:57 +03:00
Ariejan de Vroom 2b4bebd9f2 Doc: set permission on config.database.yml 2013-06-29 17:31:08 +03:00
Ariejan de Vroom b8ce544703 Merge branch 'bbodenmiller-master' 
Closes #4331
 2013-06-29 17:19:15 +03:00
Ariejan de Vroom ab36cdec84 Tweak wording and phrasing 2013-06-29 17:19:10 +03:00
Ariejan de Vroom 729c74320a Merge branch 'master' of git://github.com/bbodenmiller/gitlabhq into bbodenmiller-master 2013-06-29 17:13:47 +03:00
Ariejan de Vroom 7fb9047223 Merge branch 'muskox-master' 
Closes #4424
 2013-06-29 16:37:51 +03:00
Scott PustayandAriejan de Vroom 2000f013f7 fixed typo in assgned 2013-06-29 16:37:41 +03:00
Dmitriy Zaporozhets 0904cc485c Classic theme: Dark color for header links. White color for loading spinner 2013-06-29 09:05:26 +03:00
Thurston StoneandThurston Stone 2a601d26f2 Adding detailed documentation of the markdown syntax. 
This includes standard markdown as well as GitLab extended markdown as well as references to documents used.
 2013-06-29 00:44:24 -05:00
Dmitriy Zaporozhets 28d517f58e Reduce the size of main nav 2013-06-29 08:35:52 +03:00