summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Merge branch 'add-notes-notifications-to-services' into 'master'Douwe Maan2015-03-0635-19/+736
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notes notifications to services This merge request builds on top of a few other merge requests: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/350 The purpose of this merge request is to add service notification support when a user comments on one of the following: * commits * issues * merge requests * code snippets Currently HipChat and Slack are only supported. The admin can select which events to toggle on or off. ## Questions All note events are bundled under the `note` event type. Is this okay, or does it make more sense to have individual events and/or change the `object_type` attribute in the hook data? Also, does it look better to link the entire `merge request #X` as opposed to just `#X`? I like the former. ## Before ![Screen Shot 2015-03-01 at 3.05.56 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/8ae828e652/Screen_Shot_2015-03-01_at_3.05.56_PM.png) ## After ![Screen Shot 2015-03-06 at 6.24.40 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/7b866ae02b/Screen_Shot_2015-03-06_at_6.24.40_AM.png) ### Slack ![Screen Shot 2015-03-01 at 2.59.00 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/0147c2dc38/Screen_Shot_2015-03-01_at_2.59.00_PM.png) ### HipChat ![Screen Shot 2015-03-01 at 2.59.19 PM](https://gitlab.com/uploads/stanhu/gitlab-ce/14e78fc61c/Screen_Shot_2015-03-01_at_2.59.19_PM.png) See merge request !358
| | * | | | | | | | | | | | | | | Added comment notification events to HipChat and Slack services.Stan Hu2015-03-0635-19/+736
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Merge branch 'bootstrap-btns' into 'master'Dmitriy Zaporozhets2015-03-062-114/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use bootstrap buttons with custom colors instead of own css Reduce amount of custom css will make UI development easier See merge request !1641
| * | | | | | | | | | | | | | | Use bootstrap buttons with custom colors instead of own cssDmitriy Zaporozhets2015-03-062-114/+14
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Fix bug with active tab remembering (saving cookie with different path)Dmitriy Zaporozhets2015-03-061-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets2015-03-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab_git to fix 500 with annotated tags w/o message Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181 See merge request !1640
| * | | | | | | | | | | | | | | Bump gitlab_git to fix 500 with annotated tags w/o messageDmitriy Zaporozhets2015-03-052-3/+3
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-053-5/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'add-more-hipchat-notifications' into 'master'Douwe Maan2015-03-053-5/+185
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add merge and issue event notification for HipChat This adds merge and issue event notification for HipChat. This depends on the MR used for Slack: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 This should also address #1085. Before: ![Screen Shot 2015-02-23 at 8.55.08 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/6123e3251b/Screen_Shot_2015-02-23_at_8.55.08_AM.png) After: ![Screen Shot 2015-02-23 at 8.54.22 AM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/19eabc8bf6/Screen_Shot_2015-02-23_at_8.54.22_AM.png) ![Screen Shot 2015-02-23 at 9.25.51 PM](https://gitlab.com/uploads/gitlab-org/gitlab-ce/0ea6229ddc/Screen_Shot_2015-02-23_at_9.25.51_PM.png) See merge request !350
| | * | | | | | | | | | | | | | | Add merge and issue event notification for HipChatStan Hu2015-03-053-5/+185
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5Robert Schilling2015-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | Update gemnasium-gitlab-service gem
| | * | | | | | | | | | | | | | | | Update gemnasium-gitlab-service gemfabien2015-03-041-1/+1
| | | |_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'cache-project-row' into 'master'Dmitriy Zaporozhets2015-03-051-20/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache project row on dashboard, group and user page See merge request !1639
| * | | | | | | | | | | | | | | | | Cache project row on dashboard, group and user pageDmitriy Zaporozhets2015-03-051-20/+21
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'fix-checkbox-align' into 'master'Dmitriy Zaporozhets2015-03-052-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix checkbox alignment in application settings Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels. See #2053. Also add aria-describedby attributes to form controls that have a help text block (http://getbootstrap.com/css/#callout-help-text-accessibility). ## Before ![Admin_area___GitLab](https://dev.gitlab.org/Okada/gitlabhq/uploads/2736fe81ba564b43cbef37cd187cf47a/Admin_area___GitLab.png) --- ## After ![Admin_area___GitLab_-_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/95a8a26600458c9c55bc05d2e0c6be47/Admin_area___GitLab_-_after.png) --- This doesn't address the help text block for the twitter checkbox. @dzaporozhets Do you want to keep the help text visible or would you rather put it in a dialog and hide it initially? cc @sytse See merge request !1615
| * | | | | | | | | | | | | | | | Fix checkbox alignment in application settingsVinnie Okada2015-03-022-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels. Also add aria-describedby attributes to form controls that have a help text block.
* | | | | | | | | | | | | | | | | Merge pull request #8918 from rumpelsepp/update-rugmentsRobert Schilling2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Update rugments, fixes #8900
| * | | | | | | | | | | | | | | | Update rugments, fixes #8900Stefan Tatschner2015-03-051-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'collapsed-projects-list' into 'master'Dmitriy Zaporozhets2015-03-0510-80/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve projects list * Add search filtering for group projects * Show all user projects on dashboard * Refactor projects list into one view * Hide big list of projects with 'Show all' button For #2069 See merge request !1636
| * | | | | | | | | | | | | | | | Fix project create link on group pageDmitriy Zaporozhets2015-03-041-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Improve projects listDmitriy Zaporozhets2015-03-0410-80/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add search filtering for group projects * Show all user projects on dashboard * Refactor projects list into one view * Hide big list of projects with 'Show all' button
* | | | | | | | | | | | | | | | | Merge branch 'timeout' into 'master'Dmitriy Zaporozhets2015-03-057-16/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase timeout for Git-over-HTTP requests. Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232. Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty. The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`. See merge request !1619
| * | | | | | | | | | | | | | | | Increase timeout for Git-over-HTTP requests.Douwe Maan2015-03-047-16/+50
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'update-spring' into 'master'Dmitriy Zaporozhets2015-03-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update spring to 1.3.3 See merge request !1635
| * | | | | | | | | | | | | | | | | Update spring to 1.3.3Dmitriy Zaporozhets2015-03-042-3/+3
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'annotate-models' into 'master'Dmitriy Zaporozhets2015-03-0439-414/+462
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-annotate models See merge request !1634
| * | | | | | | | | | | | | | | | Re-annotate modelsDmitriy Zaporozhets2015-03-0439-414/+462
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'add-more-slack-notifications' into 'master'Dmitriy Zaporozhets2015-03-0450-244/+873
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Fix specs.Douwe Maan2015-03-031-3/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix changelog.Douwe Maan2015-03-031-3/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Set correct object_kind on tag push data.Douwe Maan2015-03-032-3/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Set supported events per project service.Douwe Maan2015-03-0319-57/+156
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Execute GitlabCiService for both push and tag_push events.Douwe Maan2015-03-031-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Execute tag_push services and hooks when tag is created through web UI.Douwe Maan2015-03-031-5/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Don't execute GitlabCiService twice for pushed tags.Douwe Maan2015-03-031-4/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Only execute GitlabCiService for push events.Douwe Maan2015-03-031-2/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix specs.Douwe Maan2015-03-038-14/+12
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Execute services for tag push.Douwe Maan2015-03-031-0/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Code style, directory structure.Douwe Maan2015-03-0313-57/+59
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu2015-03-0347-195/+722
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | | Move items to the correct version in the changelog.Marin Jankovski2015-03-041-4/+5
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Update changelog.Marin Jankovski2015-03-041-0/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Update the Changelog.Marin Jankovski2015-03-041-0/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'web_hook_extend' into 'master'Dmitriy Zaporozhets2015-03-043-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web Hook sends email of pusher See merge request !1630
| * | | | | | | | | | | | | | | | Web Hook sends email of pusherValery Sizov2015-03-043-0/+4
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'changelog-fix' into 'master'Marin Jankovski2015-03-041-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Service Templates to CHANGELOG See merge request !1633
| * | | | | | | | | | | | | | | | | Added Service Templates to CHANGELOG and fixed typo.Patricio Cano2015-03-041-1/+2
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'triage-link' into 'master'Dmitriy Zaporozhets2015-03-041-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advise on how to help others. See merge request !1632
| * | | | | | | | | | | | | | | | | Advise on how to help others.Sytse Sijbrandij2015-03-041-0/+7
| |/ / / / / / / / / / / / / / / /