home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 13:06:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,444 Commits 48 Branches 340 Tags
36a3ea5d726f89a18b08a67e21455540bc2a5aa8
Commit Graph
8444 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Cestari 36a3ea5d72 Fix error with reopened merge request not properly reloading 
If you reopen a Merge Request and then try to update the source branch
it won't properly reload the code since the "reload_code" method still
checks if the MR is "opened" and not just "open" (which includes reopened)
 2014-03-11 17:20:02 -04:30
Dmitriy Zaporozhets ad5e5b5cfa Merge branch '6-6-stable' of github.com:gitlabhq/gitlabhq into 6-6-stable 2014-03-05 13:21:29 +02:00
Dmitriy Zaporozhets 8f48f38683 Version 6.6.5 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.5 		2014-03-05 13:20:26 +02:00
Dmitriy Zaporozhets 0fd3ed99df Merge branch '6-6-5-patch' into '6-6-stable' 
6.6.5 patch

* adds ability to reopen mr
* adds ability to remove issue assignee
* removes close button from diff comment form
 2014-03-05 11:19:06 +00:00
Dmitriy Zaporozhets e9358f5a40 Hide close mr button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-05 11:49:16 +02:00
Dmitriy Zaporozhets 23d164477d Add tests to reopen MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-05 11:32:43 +02:00
Dmitriy Zaporozhets 87837e54b4 Feature: reopen closed merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/merge_requests/show/_mr_title.html.haml
 2014-03-05 11:32:27 +02:00
Jason BlanchardandDmitriy Zaporozhets 3338146392 Added option to remove issue assignee on project issue page and issue edit page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-05 11:18:22 +02:00
Dmitriy Zaporozhets b102180630 Hide mr close button for comment form if merge request was closed or inline comment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/merge_requests/_show.html.haml
 2014-03-05 11:07:19 +02:00
Dmitriy Zaporozhets d50cbb6aa4 Merge pull request #6458 from wirehack7/patch-1 
Update installation.md
 2014-03-04 18:44:11 +02:00
wirehack7 72b2a6b2f2 Update installation.md 
Fixed the MySQL documentation link.
 2014-03-02 23:57:21 +01:00
Dmitriy Zaporozhets 32bfc4be10 Merge pull request #6424 from endzyme/patch-1 
added verify false on gitlab_ci integrations
 2014-02-28 22:45:51 +02:00
Dmitriy Zaporozhets 42e34aec97 Version 6.6.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.4 		2014-02-27 16:38:20 +02:00
Dmitriy Zaporozhets 2945ba36e2 Merge branch '6-6-4-patch' into '6-6-stable' 
6-6-4 Patch
 2014-02-27 14:36:44 +00:00
Dmitriy Zaporozhets 51257280ce html_escape is private for rails 4.0.2 :( 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 13:19:44 +02:00
Dmitriy Zaporozhets 2c797eb94f Enable html_escape for code blocks highlighted in markdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 13:19:31 +02:00
Dmitriy Zaporozhets 7a21e46916 Version 6.6.3 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.3 		2014-02-26 22:51:02 +02:00
Nick Huanca 5cabc8366e added verify false on gitlab_ci integrations 
For those of us running self-signed in gitlab-ci it generates 500s SSL_verify errors if you don't have this.
 2014-02-26 12:04:32 -07:00
Dmitriy Zaporozhets cf129d6f34 Merge branch '6-6-3-patch' into '6-6-stable' 
6.6.3 Patch

Fixes 500 error when try to edit own user via admin area
 2014-02-26 15:38:44 +00:00
Dmitriy Zaporozhets 98f4665eaf Hide user membership in groups at user page 
Based on projects visitor can see when browse user page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 12:56:51 +02:00
Dmitriy Zaporozhets dbd3680f46 Fix 500 error when try to update own profile in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 12:48:35 +02:00
Dmitriy Zaporozhets 4ef836923a Version 6.6.2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.2 		2014-02-25 09:36:40 +02:00
Dmitriy Zaporozhets 720babec07 Fixed 500 error on branch and tag creation via UI 
Also fixes issue with branch/tag removing via UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 09:35:09 +02:00
Dmitriy Zaporozhets 4946451598 Version 6.6.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.1 		2014-02-24 13:23:26 +02:00
Dmitriy Zaporozhets aa0529af5a Fix submodules 500 error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 13:22:30 +02:00
Dmitriy Zaporozhets 490f99d45e New stable branches and update guide 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.0 		2014-02-21 17:07:43 +02:00
Dmitriy Zaporozhets 1a3527f6e7 Version to 6.6.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 17:02:38 +02:00
Dmitriy Zaporozhets bbd92f554d Limit huge images in diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-21 16:32:42 +02:00
Dmitriy Zaporozhets 138e2a50b7 PostgreSQL is first one now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 15:16:33 +02:00
Marin Jankovski e8466a21ca Merge branch 'case_sensitivity' into 'master' 
Case Sensitivity for MYSQL

#1014
 2014-02-20 12:18:22 +00:00
Dmitriy Zaporozhets 0f080a9410 Make sure note.system is false if created by user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-20 14:07:42 +02:00
Marin Jankovski fcdcb1a675 Move database setup guide inside the installation. 2014-02-20 12:31:04 +01:00
Marin Jankovski a7a2100f3d Doc syntax highlighting. 2014-02-20 10:51:58 +01:00
Marin Jankovski acdb808abc Update database documentation. 2014-02-20 10:10:25 +01:00
Marin Jankovski c1dddf8c7d Uniqueness check should be case insensitive for username and path, otherwise mysql behaves weird. 2014-02-20 09:45:58 +01:00
Dmitriy Zaporozhets 499a118590 Time for rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.6.0.rc1 		2014-02-20 10:24:31 +02:00
Dmitriy Zaporozhets dad6b0213c Mention new rails in changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 14:49:44 +02:00
Dmitriy Zaporozhets d353e203c8 Merge branch 'link-release-docs' into 'master' 
Link Release Docs
 2014-02-19 12:44:35 +00:00
Dmitriy Zaporozhets 1b41b7c989 Merge branch 'rails-4-0-3' into 'master' 
Rails 4.0.3

Blog post with more information http://weblog.rubyonrails.org/2014/2/18/Rails_3_2_17_4_0_3_and_4_1_0_beta2_have_been_released/
 2014-02-19 12:43:41 +00:00
dosire 06fc7e31b5 Refer to release docs. 2014-02-19 13:12:55 +01:00
Dmitriy Zaporozhets 2b8d289130 Fix readme h4 style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 13:10:31 +02:00
Dmitriy Zaporozhets 0bd0c8149b More for changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 12:06:10 +02:00
Dmitriy Zaporozhets c9befd3d1b Update rails to version 4.0.3 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 11:55:26 +02:00
Dmitriy Zaporozhets 6a18fd9862 Merge branch 'restyle/issue' into 'master' 
Improve UI for Issue#show, MR#show pages
 2014-02-19 09:24:52 +00:00
Dmitriy Zaporozhets ededfd2d29 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 10:35:24 +02:00
Dmitriy Zaporozhets ee75029867 Move assignee/milestone below description of Issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-19 09:38:01 +02:00
Dmitriy Zaporozhets b09610b525 Merge branch 'add-apps' into 'master' 
Add Apps
 2014-02-18 20:50:01 +00:00
Dmitriy Zaporozhets 83d35399d1 Move MR alert info out of issue-box 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 22:29:12 +02:00
Dmitriy Zaporozhets 88b8b15dbd Improve UI for Issue/MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 22:05:44 +02:00
dosire c0e29f2540 Add apps to readme. 2014-02-18 20:59:34 +01:00