home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,812 Commits 48 Branches 340 Tags
dffa2fa9e92e37a664afa2807fd5b01fbbd87ef2
Commit Graph
1607 Commits
Author SHA1 Message Date
Douwe Maan f96dc6295a Everything from gitlab_git is already UTF-8. 2015-03-13 13:49:27 +01:00
Drew Blessing 606d24ff2d Merge branch 'irker-service-use-supported-events' into 'master' 
Make Irker service check supported_events

63178a9509 added the supported_events check for services. Since f84b7eef3f was just added, we should adjust it accordingly.

See merge request !367
 2015-03-13 00:41:07 +00:00
Marin Jankovski 6d0ff0ade8 Remove placeholder methods to prevent calling methods rather than attributes. 2015-03-10 18:09:13 -07:00
Dmitriy Zaporozhets 961971544a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-10 12:03:58 -07:00
Marin Jankovski 82bb3ec33d Merge branch 'issues-tracker-id' into 'master' 
Properly move over `issues_tracker_id` from old custom issue tracker URLs.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1124.

cc @marin Regression in 7.8.0.

See merge request !1670
 2015-03-10 17:07:49 +00:00
Douwe Maan 76842aac75 Properly move over issues_tracker_id from old custom issue tracker URLs. 2015-03-10 14:14:49 +01:00
Douwe Maan 383c56efa1 Use Gitlab::Git helper methods and constants as much as possible. 2015-03-10 13:39:31 +01:00
Douwe Maan 94a955893c Merge branch 'fix-commit-calendar-emails' into 'master' 
Fix commit calendar to use all user emails

This MR improves upon Hannes Rosenögger's changes:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/364

See merge request !378
 2015-03-10 08:58:35 +00:00
Stan Hu b26ab0ceeb This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account. 
This fixes one of the problems mentioned in gitlab-org/gitlab-ce#1162 and makes the behavior of the commit calendar as described in the profile.
"All email addresses will be used to identify your commits."
 2015-03-09 21:43:54 -07:00
Dmitriy Zaporozhets de629b4835 Blocking user does not remove him/her from project/groups but show blocked label 2015-03-09 19:02:30 -07:00
Dmitriy Zaporozhets 8b551ee318 Merge branch 'emails-on-push' 
Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/project_services/emails_on_push_service.rb
 2015-03-08 16:49:11 -07:00
Dmitriy Zaporozhets e68ad7fbb8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-06 16:13:43 -08:00
Dmitriy Zaporozhets 7dadd423d5 Merge branch 'condensed-mr-commits' into 'master' 
Condense commits already in target branch when updating merge request source branch.

Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043.

![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png)

(Not shown in screenshot, but works fine with rebases as well)

See merge request !1648
 2015-03-07 00:13:10 +00:00
Douwe Maan 84ebc22ad2 Use 2 periods instead of 3 to signify inclusive range. 2015-03-06 23:12:26 +01:00
Douwe Maan 663b3c968f Condense commits already in target branch when updating merge request source branch. 2015-03-06 18:09:00 +01:00
Stan Hu ad14ed5e49 Add tag_push event notification to HipChat and Slack services. 
Normalize output to use:
- User name instead of username
- Include first line of title in message description
- Link to "Issue #X" instead of "#X"
 2015-03-06 08:31:49 -08:00
Stan Hu 7e204cf389 Added comment notification events to HipChat and Slack services. 
Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
 2015-03-06 06:54:00 -08:00
Stan Hu f12ec5f4e8 Add merge and issue event notification for HipChat 2015-03-05 08:23:38 -08:00
Stan Hu 6ddd45948f Make Irker service use the supported events check 2015-03-04 22:31:28 +00:00
Dmitriy Zaporozhets 66c61f023b Re-annotate models 2015-03-04 14:14:00 -08:00
Dmitriy Zaporozhets 63178a9509 Merge branch 'add-more-slack-notifications' into 'master' 
Add more Slack notifications for issue and merge request events

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 by Stan Hu.

See merge request !1556
 2015-03-04 21:57:17 +00:00
Marin Jankovski e6a0fb1f77 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-03 11:50:21 -08:00
Hannes Rosenögger 10212c01fd Count commits in branches as well in the commit calendar 2015-03-03 15:31:05 +01:00
Douwe Maan d57e809cbd Set supported events per project service. 2015-03-03 11:14:32 +01:00
Douwe Maan 85fa334eb6 Execute GitlabCiService for both push and tag_push events. 2015-03-03 11:14:32 +01:00
Douwe Maan f13567edc4 Only execute GitlabCiService for push events. 2015-03-03 11:14:32 +01:00
Douwe Maan d86c0cda24 Fix specs. 2015-03-03 11:14:32 +01:00
Douwe Maan d9ff616fd8 Code style, directory structure. 2015-03-03 11:14:32 +01:00
Stan HuandDouwe Maan afe5d7d209 Issue #595: Support Slack notifications upon issue and merge request events 
1) Adds a DB migration for all services to toggle on push, issue, and merge events.

2) Upon an issue or merge request event, fire service hooks.

3) Slack service supports custom messages for each of these events. Other services
not supported at the moment.

4) Label merge request hooks with their corresponding actions.
 2015-03-03 11:14:31 +01:00
Dmitriy Zaporozhets f438791721 Fix import check for case sensetive namespaces 2015-03-02 23:06:59 -08:00
Dmitriy Zaporozhets 33e107127a Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_ref 
Fix for TeamCity buildQueue REST API build/@branchName.
 2015-03-02 15:23:15 -08:00
Dmitriy Zaporozhets f00feb14ec Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service 
Conflicts:
	app/controllers/projects/services_controller.rb
 2015-03-02 15:22:31 -08:00
Dmitriy Zaporozhets e39bf83770 Merge pull request #8501 from AKoetsier/slack_channel_and_username 
Allow a user to specify a channel and username for the slack-webhook
 2015-03-02 15:17:56 -08:00
Aorimn f84b7eef3f Add Irker service 
Irker is a gateway which sends IRC messages on git updates. This new
service provides an interface to this gateway, integrated in Gitlab, for
each updates.
As per the guidelines, this commit adds the new feature in the
CHANGELOG, tests and documentation.

See http://www.catb.org/esr/irker/
 2015-03-01 20:51:03 +01:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url 
Expose avatar_url in projects API
 2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API 
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
 2015-03-01 10:13:01 +09:00
Andrès Koetsier d2c85a68bb Allow a user to specify a channel and username for the slack-webhook 2015-02-28 10:06:32 +01:00
Douwe Maan 804a2488cf Fix and test User#contributed_projects_ids. 2015-02-27 10:49:47 +01:00
Dmitriy Zaporozhets 5cd304dd5e Merge branch 'fix-invalid-syntax' into 'master' 
Fix git syntax issue for git version older then 1.7.10

For #2067

See merge request !1599
 2015-02-26 02:49:12 +00:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master' 
Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530
 2015-02-25 23:36:03 +00:00
Dmitriy Zaporozhets 1511506f72 Fix git syntax issue 2015-02-25 15:17:20 -08:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Douwe Maan f0b78a8529 Clarify EmailsOnPushService options. 2015-02-25 16:40:48 +01:00
Douwe Maan 85af3e82bf Add option to disable code diffs to EmailOnPush. 
See #1950
 2015-02-25 14:29:49 +01:00
Douwe Maan e0c186c357 Add option to send EmailsOnPush from committer email if domain matches. 
See #1809.
 2015-02-25 14:20:35 +01:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/controllers/files_controller.rb
 2015-02-25 11:59:25 +01:00
Dmitriy Zaporozhets 2cd2543c44 Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master' 
Give last_activity_at a default value so it will always be set

For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345

See merge request !1589
 2015-02-24 23:15:04 +00:00
Dmitriy Zaporozhets 2cedeb4856 Merge branch 'contributed-projects' into 'master' 
Improve contributed project and commit calendar selection.

Fixes #2024.

See merge request !1554
 2015-02-24 21:07:05 +00:00
Douwe Maan 5179c5830b Contributed projects either have user pushes or created MRs. 2015-02-24 18:13:11 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00