home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
190 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +03:00
Dmitriy Zaporozhets 9879c427ce If MR commits are empty if does not mean compare failed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 23:04:14 +03:00
Dmitriy Zaporozhets be5b6db883 Refactor diff suppress logic and diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets 45623089e2 Refactor MR build process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:34:06 +03:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Dmitriy Zaporozhets 5bb2840dc4 Merge branch 'notification_when_reopened' into 'master' 
Notification when reopened issue or mr

Fixes #1396

See merge request !939
 2014-07-05 05:40:32 +00:00
Marin Jankovski 310231dbed Reopen mr email notification. 2014-07-03 13:40:21 +02:00
Dmitriy Zaporozhets dcd14c0af0 Merge branch 'no_notification_for_merger' into 'master' 
No notification for merger

Fixes #1378

See merge request !935
 2014-07-03 10:51:33 +00:00
Marin Jankovski 1208c6caa8 Notification for reopened issue. 2014-07-03 12:51:24 +02:00
Marin Jankovski c3533deda1 Don't notify the user that triggered the mr notification. 2014-07-03 10:26:47 +02:00
Marin Jankovski f50c7ecadc Remove new lines. 2014-07-02 19:09:27 +02:00
Marin Jankovski bc7656a306 Do not notify person who merged the MR. 2014-07-02 16:38:03 +02:00
Marin Jankovski 12f696c23e Remove unecessary return. 2014-07-02 16:02:26 +02:00
Marin Jankovski 39f82b75f5 When assigning an unassigned issue send notification with the correct text. 2014-07-02 11:55:05 +02:00
Dmitriy Zaporozhets d35a99e6cb Merge pull request #7204 from cirosantilli/user-validation-msg 
Fix username validation message to match regexp.
 2014-07-02 09:57:14 +03:00
Dmitriy Zaporozhets 8fb76a8308 Merge branch 'group_milestones' into 'master' 
Group milestones
 2014-07-01 07:18:15 +00:00
Dmitriy Zaporozhets 4f0bfdb500 Merge branch 'strong-parameters' into 'master' 
Strong parameters

Replace protected_attributes with strong parameters.
Fixes #1340
 2014-06-30 17:01:22 +00:00
Marin Jankovski fdbf77ef99 Fix styling issues. 2014-06-30 13:27:17 +02:00
Marin Jankovski c223fb1a96 Start building group milestone show page. 2014-06-30 09:45:16 +02:00
Marin Jankovski b6425f33bc Get one group milestone based on milestone title. 2014-06-30 09:44:30 +02:00
Marin Jankovski 0723bf1afa Move group milestone processing from service to model. 2014-06-30 09:44:30 +02:00
Marin Jankovski 8e8c074205 Reuse existing milestones counting. 2014-06-30 09:44:30 +02:00
Marin Jankovski 58570880f0 Create group milestones service. 2014-06-30 09:44:30 +02:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Jacob Vosmaer b5007c1565 Rename MergeRequest#lock! to #lock_mr! 
As a warning from the StateMachine gem points out to us, there already
exists a method ActiveRecord#lock!. This change renames the `lock` and
`unlock` events defined on MergeRequest to `lock_mr` and `unlock_mr`.
 2014-06-26 14:09:17 +02:00
Ciro Santilli b1c40e8151 Fix username validation message to match regexp. 
Also used for project, group and web ui new file names.
 2014-06-26 13:31:34 +02:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets aadef92f1d Merge pull request #7013 from jvanbaarsen/better-webhook-information 
Return a little more information in Issue webhook
 2014-06-24 10:37:15 +03:00
Dmitriy Zaporozhets e7cf10e446 Merge pull request #5531 from NotSqrt/add-search 
Add ability to search in issue description and issue comments
 2014-06-24 10:36:04 +03:00
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Dmitriy Zaporozhets 73f91da8b1 Fix project deletion and tests 2014-06-17 23:49:17 +03:00
Dmitriy Zaporozhets a7d5052cd4 Remove SystemHook observer 2014-06-17 22:20:10 +03:00
Dmitriy Zaporozhets 6149dba518 Remove NotesObserver 2014-06-17 22:09:01 +03:00
Dmitriy Zaporozhets a7f3672b75 Remove project observer 2014-06-17 21:53:26 +03:00
Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb
 2014-06-17 10:53:44 +03:00
Dmitriy Zaporozhets d5b0f29c4a Move gravatar url compose to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:11:46 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Jeroen van Baarsen 87760a290e Added an UrlBuilder for building rails named routes 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-13 12:34:15 +02:00
Jeroen van Baarsen 45e1941fb3 Return a little more information in Issue webhook 
When a webhook for issues is triggered, it should also return the
resource URL, and the action that was performed (ie: Was it reopened,
updated, opened or closed)
 2014-06-13 12:14:43 +02:00
Dmitriy Zaporozhets f6ee55aabd Fix issue/mr close/reopen via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 19:23:02 +03:00
Dmitriy Zaporozhets d65bf4605e Fix milestone reopen 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 19:22:39 +03:00
Dmitriy Zaporozhets c4b02642d2 Replace milestone observer with services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 18:07:52 +03:00
Dmitriy Zaporozhets 55440ac9be Make a comment to MR whne milestone was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:33:17 +03:00
Dmitriy Zaporozhets 525fa6c11b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:29:23 +03:00
Dmitriy Zaporozhets 7edf65d1ee Make a system comment when issue milestone changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:25:43 +03:00
Dmitriy Zaporozhets 0fdce4a52b Refactor some search scopes to prevent wierd behaviour and PG::Error issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 20:37:35 +03:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Dmitriy Zaporozhets aca6be50d3 Refactor project transfer service. Add security check when create or transfer project into group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:02:26 +03:00
Marin Jankovski 3b2b3cff04 Move logic to image_service. 2014-05-26 14:54:03 +02:00