home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 04:36:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,543 Commits 48 Branches 340 Tags
6-4-stable
Commit Graph
7543 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer 317362666b Disable SSL peer verification for all webhooks 
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda459. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
 2014-01-15 15:32:54 +01:00
Dmitriy Zaporozhets 38397dbed2 Merge pull request #5983 from yasuoza/fix/6-4-stable 
Fix 'gon' gem install failure. refs #5955
 2014-01-07 02:29:50 -08:00
Yasuharu Ozaki db5b70b1c5 Fix 'gon' gem install failure. refs #5955 2014-01-05 22:38:52 +09:00
Dmitriy Zaporozhets 180ab97571 Merge pull request #5955 from wishlistmaster/6-4-stable 
Gem 'gon' issue on Ubuntu LTS
 2014-01-04 12:42:13 -08:00
Manly Florido 5b2ac3fa26 Update Gemfile.lock 2013-12-30 15:33:15 +08:00
Manly Florido eae84c0c37 Update Gemfile 2013-12-30 15:24:47 +08:00
Dmitriy Zaporozhets 42131d0189 Version to 6.4.3 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.3 		2013-12-23 20:43:59 +02:00
James NewtonandDmitriy Zaporozhets 84093385d6 don't use unicorn worker killer if PhusionPassenger is defined 2013-12-23 20:43:31 +02:00
Dmitriy Zaporozhets 221af222d6 Add 6.4.1 and 6.4.2 CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2013-12-23 18:30:20 +02:00
Dmitriy Zaporozhets 214a013bb2 Version to 6.4.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.2 		2013-12-23 18:11:40 +02:00
Dmitriy Zaporozhets 58472180b3 Fix upgrader 
It created branch based on current branch which is an old version

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 18:05:31 +02:00
Dmitriy Zaporozhets 6bc3b5dfa1 Version to 6.4.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.1 		2013-12-23 14:21:40 +02:00
Dmitriy Zaporozhets cc51931d1f Fix 500 error when rename repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 14:21:02 +02:00
Dmitriy Zaporozhets 5582ae145d Fix project transfer feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 14:20:49 +02:00
Dmitriy Zaporozhets 0e4a8e231c Version 6.4.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.0 		2013-12-20 16:03:05 +02:00
Dmitriy Zaporozhets 1dab27ee37 Update guide for 6.3 to 6.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 16:02:26 +02:00
Dmitriy Zaporozhets be3e1ccb9d Point ot 6-4-stable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 16:02:06 +02:00
Dmitriy Zaporozhets 6d3bb508f5 Merge branch 'bug/mr_iids_duplicate' of /home/git/repositories/gitlab/gitlabhq 2013-12-20 10:31:27 +00:00
Dmitriy Zaporozhets 1231a3678a Dont allow change of MR target or source projects after it was created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-20 09:48:43 +02:00
Dmitriy Zaporozhets 8bcb2ff27e Merge pull request #5865 from skv-headless/master 
pluck user_ids during team import
 2013-12-19 08:56:51 -08:00
Dmitriy Zaporozhets 33feaa0428 Merge pull request #5881 from gendoc/master 
More issues and merge request events support in Project web hooks
 2013-12-19 08:56:09 -08:00
Dmitriy Zaporozhets dc4b7cb49a More visible title for Issues, MR etc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 18:54:07 +02:00
Humberto Pereira 392d79db0e Updated help page for Project web hooks 2013-12-19 13:32:30 -02:00
Humberto Pereira d429835ae0 Added hook execution to reopened e updated merge requests 2013-12-19 13:25:50 -02:00
Humberto Pereira 1e8add3229 Added hook execution to reopened e updated issues 2013-12-19 13:23:22 -02:00
Dmitriy Zaporozhets 8c670b66f0 Show repo size for project show page in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 17:15:48 +02:00
Dmitriy Zaporozhets 8fb9dccd3b Merge branch 'unicorn_worker_killer' of /home/git/repositories/gitlab/gitlabhq 2013-12-19 07:30:42 +00:00
Dmitriy Zaporozhets 566b49624a Merge pull request #5867 from jhollingsworth/feature/styling-changes 
Change archive icon and clone panel styling.
 2013-12-18 11:14:07 -08:00
Dmitriy Zaporozhets 35c4351e2b Validate project creator only on create 
This fixes bug when creator was removed and you cant edit project
because validation requires creator.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 20:58:16 +02:00
Jacob Vosmaer 5e93494db2 Use a block for the unicorn gems 2013-12-18 17:06:49 +01:00
Jacob Vosmaer d27224ceca Add unicorn-worker-killer with memory check 
Conflicts:
	Gemfile.lock
 2013-12-18 16:52:14 +01:00
Dmitriy Zaporozhets 4db2e97bf4 6.4 in beta now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 17:10:12 +02:00
Dmitriy Zaporozhets bd94cae8f4 Merge branch 'irc-official' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 15:03:18 +00:00
Jason Hollingsworth e1fa9abd89 Change archive icon and clone panel styling. 2013-12-18 08:46:06 -06:00
Dmitriy Zaporozhets 5e21976d13 Set font-weight:500 for row titles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:33:40 +02:00
Dmitriy Zaporozhets 078b3f580e Rename Services to Project services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 3b0acc9eea Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 14:22:59 +00:00
Dmitriy Zaporozhets 4efaa51bbe Make comment preview button white 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:07:49 +02:00
Dmitriy Zaporozhets 1f41e1bcdd Improve commits page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:03:59 +02:00
Dmitriy Zaporozhets 5cb8525891 move arhoved label from project title to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 15:02:31 +02:00
Dmitriy Zaporozhets 79248f4ca5 Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url 
Update default public pull url.
 2013-12-18 04:41:06 -08:00
Dmitriy Zaporozhets dad576a777 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-18 14:40:37 +02:00
Dmitriy Zaporozhets afd747d4d7 Merge branch 'feature/email_on_push_service' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 12:40:09 +00:00
Dmitriy Zaporozhets bb0a47d410 Merge pull request #5868 from beautyfree/patch-1 
Duplicate opened scope for issue
 2013-12-18 04:23:13 -08:00
Dmitriy Zaporozhets bea6eba8b5 Merge pull request #5869 from Spone/patch-1 
Tiny wording fix
 2013-12-18 04:22:46 -08:00
Dmitriy Zaporozhets 6ac73f45f0 Move EmailOnPush logic to async worker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 13:42:12 +02:00
Dmitriy Zaporozhets fc3878c034 Email on push mailer spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 13:30:04 +02:00
Hans Lemuet ff0d8a18bf tiny wording fix 
GitLab users can can see this snippet -> GitLab users can see this snippet
 2013-12-18 00:04:40 +01:00
Alexey Elizarov 984eb08cbe Duplicate opened scope for issue 
Was it correct?
 2013-12-17 23:32:19 +03:00
Jason Hollingsworth 1521f467cb Update default public pull url. 
This updates the default pull URL for public projects when the user
is not logged in.
 2013-12-17 12:48:59 -06:00