summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'emails-on-push'Dmitriy Zaporozhets2015-03-081-3/+18
|\
| * Clarify EmailsOnPushService options.Douwe Maan2015-02-251-2/+5
| * Add option to disable code diffs to EmailOnPush.Douwe Maan2015-02-251-1/+7
| * Add option to send EmailsOnPush from committer email if domain matches.Douwe Maan2015-02-251-1/+7
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-066-38/+57
|\ \
| * | Add tag_push event notification to HipChat and Slack services.Stan Hu2015-03-066-38/+57
* | | Merge branch 'condensed-mr-commits' into 'master'Dmitriy Zaporozhets2015-03-071-4/+27
|\ \ \ | |/ / |/| |
| * | Use 2 periods instead of 3 to signify inclusive range.Douwe Maan2015-03-061-1/+1
| * | Condense commits already in target branch when updating merge request source ...Douwe Maan2015-03-061-4/+27
* | | Added comment notification events to HipChat and Slack services.Stan Hu2015-03-0619-8/+182
|/ /
* | Add merge and issue event notification for HipChatStan Hu2015-03-051-5/+82
* | Re-annotate modelsDmitriy Zaporozhets2015-03-0425-282/+296
* | Merge branch 'add-more-slack-notifications' into 'master'Dmitriy Zaporozhets2015-03-0426-154/+511
|\ \
| * | Set supported events per project service.Douwe Maan2015-03-0317-28/+85
| * | Execute GitlabCiService for both push and tag_push events.Douwe Maan2015-03-031-1/+1
| * | Only execute GitlabCiService for push events.Douwe Maan2015-03-031-2/+7
| * | Fix specs.Douwe Maan2015-03-035-6/+4
| * | Code style, directory structure.Douwe Maan2015-03-0313-57/+59
| * | Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu2015-03-0326-122/+417
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-031-1/+1
|\ \ \
| * | | Count commits in branches as well in the commit calendarHannes Rosenögger2015-03-031-1/+1
| |/ /
* | | Fix import check for case sensetive namespacesDmitriy Zaporozhets2015-03-021-0/+5
|/ /
* | Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_refDmitriy Zaporozhets2015-03-021-2/+2
|\ \
| * | Fix for TeamCity buildQueue REST API build/@branchName.Standa Opichal2015-02-191-2/+2
* | | Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into A...Dmitriy Zaporozhets2015-03-023-1/+155
|\ \ \
| * | | Add Irker serviceAorimn2015-03-013-1/+155
* | | | Merge pull request #8501 from AKoetsier/slack_channel_and_usernameDmitriy Zaporozhets2015-03-021-3/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Allow a user to specify a channel and username for the slack-webhookAndrès Koetsier2015-02-281-3/+10
* | | | Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-011-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Expose avatar_url in projects APIsue4452015-03-011-0/+10
* | | | Fix and test User#contributed_projects_ids.Douwe Maan2015-02-271-0/+1
|/ / /
* | | Merge branch 'fix-invalid-syntax' into 'master'Dmitriy Zaporozhets2015-02-261-1/+1
|\ \ \
| * | | Fix git syntax issueDmitriy Zaporozhets2015-02-251-1/+1
* | | | Merge branch 'extend_markdown_upload' into 'master'Dmitriy Zaporozhets2015-02-253-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-252-3/+10
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-243-4/+15
| |\ \ \
| * \ \ \ Merge branch 'master' into extend_markdown_uploadDouwe Maan2015-02-211-9/+9
| |\ \ \ \
| * \ \ \ \ Merge branch 'extend_markdown_upload' into generic-uploadsDouwe Maan2015-02-201-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Split up AttachmentUploader.Douwe Maan2015-02-203-3/+3
* | | | | | Merge branch 'bitbucket-import'Dmitriy Zaporozhets2015-02-252-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add Bitbucket importer.Douwe Maan2015-02-242-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master'Dmitriy Zaporozhets2015-02-241-0/+6
|\ \ \ \ \
| * | | | | use update_column and set to created_at like elsewhereMarco Wessel2015-02-231-3/+3
| * | | | | Give last_activity_at a default value so it will always be setMarco Wessel2015-02-231-0/+6
* | | | | | Merge branch 'contributed-projects' into 'master'Dmitriy Zaporozhets2015-02-241-3/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Contributed projects either have user pushes or created MRs.Douwe Maan2015-02-241-3/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'ldap-need-no-password' into 'master'Marin Jankovski2015-02-241-0/+5
|\ \ \ \ \
| * | | | | LDAP users don't need to set a password to Git over HTTP.Douwe Maan2015-02-231-0/+5
| | |/ / / | |/| | |
* | | | | Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ...Marin Jankovski2015-02-231-3/+9
|/ / / /
* | | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-211-9/+9
|\ \ \ \ | | |_|/ | |/| |
View Lorry Controller Status