home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,310 Commits 48 Branches 340 Tags
ec1055076c400a579d87fe970da342617efd4f94
Commit Graph
5310 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets ec1055076c Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team 
Conflicts:
	config/gitlab.yml.example
 2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets 01d8c7d6dd Merge pull request #4000 from babatakao/fix_link_404 
Fix link 404.
 2013-05-27 05:12:21 -07:00
Dmitriy Zaporozhets d5d0c00e7f Merge branch 'former03-feature_teams_api' 2013-05-27 15:05:12 +03:00
Dmitriy Zaporozhets c3ba0ee64b Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api 
Conflicts:
	doc/api/README.md
 2013-05-27 15:05:01 +03:00
Dmitriy Zaporozhets 69d70400cc Merge pull request #4076 from bke-drewb/4023 
Fix regression caused by using newer version of Grape
 2013-05-27 04:56:07 -07:00
Yves Senn 2e297c1ec2 Merge pull request #4092 from bbodenmiller/update-issue-guidelines 
improved issue reporting guidelines
 2013-05-27 04:01:46 -07:00
Ben Bodenmiller c401e5b9b1 improved issue reporting guidelines 2013-05-27 03:39:59 -07:00
Dmitriy Zaporozhets f44bd269ee Merge pull request #4072 from ndpgroup/import_w_groups 
Include groups in import with import repos rake task
 2013-05-27 03:03:30 -07:00
Dmitriy Zaporozhets b3bb558501 Merge pull request #4075 from bbodenmiller/patch-6 
remove branch dependencies in README where not necessary
 2013-05-27 02:47:16 -07:00
Dmitriy Zaporozhets b945f57fdf Merge pull request #4077 from bbodenmiller/patch-7 
clarify when issue tracker is to be used so as to not contradict issue t...
 2013-05-27 02:46:33 -07:00
Dmitriy Zaporozhets 83d68ef9fa Merge pull request #4090 from bbodenmiller/master 
add stack overflow to help page
 2013-05-27 02:45:46 -07:00
Dmitriy Zaporozhets 1194531e8e Merge pull request #4079 from bbodenmiller/patch-8 
details on looking for correct installation guide
 2013-05-27 02:45:15 -07:00
Ben Bodenmiller ac77f5ff1f add stack overflow to help page 2013-05-27 02:46:51 -06:00
Yves Senn 933dcfcd7c Merge pull request #4089 from bbodenmiller/master 
added stack overflow as support option
 2013-05-27 01:38:02 -07:00
Ben Bodenmiller 2446e91d55 added stackoverflow as support option 2013-05-27 01:33:12 -07:00
Ben Bodenmiller 8c3fe4c22f clarify when issue tracker is to be used so as to not contradict issue tracker guidelines and maintenance policy 2013-05-27 00:34:40 -07:00
Ben Bodenmiller 603720e3aa remove branch dependencies where not necessary 2013-05-27 00:32:58 -07:00
Dmitriy Zaporozhets 35e0d7feaf Merge pull request #4082 from bbodenmiller/patch-10 
no need to download init and nginx files since they are in repo now
 2013-05-26 22:51:05 -07:00
Yves Senn 8b883dc45c Merge pull request #4080 from babatakao/patch-1 
Fixed typo in CHANGELOG.md
 2013-05-26 03:30:28 -07:00
Yves Senn 8573660048 Merge pull request #4081 from bbodenmiller/patch-9 
styling and typo fixes in installation guide
 2013-05-26 03:30:07 -07:00
Ben Bodenmiller 29a522cb42 no need to download init and nginx files since they are in repo now 2013-05-25 22:51:12 -06:00
Ben Bodenmiller f66209626c styling and typo fixes in installation guide 2013-05-25 22:40:09 -06:00
Takao Baba 86b0f4f5ad Fixed typo in CHANGELOG.md 2013-05-26 13:39:46 +09:00
Ben Bodenmiller fc80592ea1 details on looking for correct installation guide 
addresses gitlabhq/gitlabhq#3809
 2013-05-25 21:15:04 -07:00
Drew Blessing 245deb5cce Fix regression caused by using newer version of Grape 
This commit fixes the regression caused by using a newer version of Grape and Grape entity.  This solves Issue 4023.
 2013-05-25 19:43:51 -05:00
James E. Flemer 5f9d78fdff Include groups in import with import repos rake task 
Expand the import glob to include `**/*.git` to find projects in groups
as well as top level projects.  Check for existing group, and create
group if needed.  Set namespace_id for imported projects.
 2013-05-25 11:38:55 -06:00
Dmitriy Zaporozhets d58aca0693 Ask people to remove 1.8 ruby to prevent issues 2013-05-25 00:20:08 +03:00
Dmitriy Zaporozhets 233eb1c693 Rename repo feature 2013-05-25 00:07:19 +03:00
Dmitriy Zaporozhets 7ef1c99db3 Update CHANGELOG 2013-05-24 23:38:33 +03:00
Dmitriy Zaporozhets 68825be12f Merge pull request #4063 from ronaldvaneede/hipchat-service 
Hipchat service implementation
 2013-05-24 13:35:43 -07:00
Dmitriy Zaporozhets 17f664866b Fix google analytics setting being ignored 2013-05-24 23:17:07 +03:00
Ronald van Eede 483f9854e4 Hipchat service implementation 2013-05-24 21:42:21 +02:00
Dmitriy Zaporozhets 63c6f30aba Fix ldap auth for http push 2013-05-24 20:36:28 +03:00
Dmitriy Zaporozhets a3645b5b4d Restyle login page for LDAP/regular login 2013-05-24 19:43:47 +03:00
Dmitriy Zaporozhets 7cb86eb335 Dont allow LDAP users to change password inside GitLab 2013-05-24 17:12:27 +03:00
Dmitriy Zaporozhets bd6dfe7d44 respect newlines for wall messages 2013-05-24 09:49:49 +03:00
Dmitriy Zaporozhets 76ffd11684 Merge pull request #3964 from mhfan/improve-sidekiq-check 
improve regrex for match(sidekiq) robustness
 2013-05-23 02:27:34 -07:00
Dmitriy Zaporozhets 25236efe6e fix missing user2 in api:repositories specs 2013-05-23 12:26:06 +03:00
Dmitriy Zaporozhets 068cf2f467 split repositories and projects api 2013-05-23 12:23:47 +03:00
Dmitriy Zaporozhets bbaa0fccfa Update poltergeist and should-matchers 2013-05-23 11:54:44 +03:00
Dmitriy Zaporozhets 5f7f35e8fe Decorate links on focus 2013-05-23 11:47:57 +03:00
Dmitriy Zaporozhets 76f3898fbf Fix milestones list pagination style 2013-05-23 11:44:24 +03:00
Dmitriy Zaporozhets f58dc8e6c9 Update bootstrap-sass 2013-05-23 10:05:07 +03:00
Dmitriy Zaporozhets a2456832d2 Update sidekiq & devise 2013-05-23 09:59:54 +03:00
Dmitriy Zaporozhets a4ff012582 Minor improve for code highlight in wiki 2013-05-23 09:54:48 +03:00
Yves Senn 6c765d30b9 Merge pull request #4035 from samurailink3/master 
Fixed typo in Readme.md
 2013-05-22 23:25:28 -07:00
Dmitriy Zaporozhets c33a5906be Merge pull request #4040 from smashwilson/generate-secret 
Security: keep the Rails secret token out of version control.
 2013-05-22 23:02:14 -07:00
ash e444c7f6ba Generate the Rails secret token on first run. 
Store the secret token in a .gitignored file called ".secret", which is
created by the initializer if it doesn't exist.
 2013-05-22 23:55:48 +00:00
Dmitriy Zaporozhets c5de01f824 Merge branch 'refactor/services' of /home/git/repositories/gitlab/gitlabhq 2013-05-22 17:18:48 +00:00
Tom Webster db4453b626 Fixed typo in Readme.md 
Fixed 22th -> 22nd
 2013-05-22 13:08:45 -03:00