22224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	254542d70d	Merge branch 'bootstrap-btns' into 'master' ... Use bootstrap buttons with custom colors instead of own css Reduce amount of custom css will make UI development easier See merge request !1641	2015-03-06 16:27:48 +00:00
Douwe Maan	76802012e6	Merge branch 'add-notes-notifications-to-services' into 'master' ... 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  ## After  ### Slack  ### HipChat  See merge request !358	2015-03-06 16:21:23 +00: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
Douwe Maan	b673d87227	Send notifications and leave system comments when bulk updating issues.	2015-03-06 15:01:13 +01:00
Douwe Maan	be94e13552	Add assignee icon to milestone merge requests.	2015-03-06 14:08:40 +01:00
Douwe Maan	dc558eb24e	Fix width of text in milestone lists.	2015-03-06 13:49:27 +01:00
Douwe Maan	757dca2b78	Escape wildcards when searching LDAP by username.	2015-03-06 13:39:57 +01:00
Dmitriy Zaporozhets	b14d21e174	Use bootstrap buttons with custom colors instead of own css	2015-03-06 02:18:53 -08:00
Dmitriy Zaporozhets	8b53d9efe6	Fix bug with active tab remembering (saving cookie with different path)	2015-03-06 01:41:47 -08:00
Dmitriy Zaporozhets	06ad715e4c	Merge branch 'bump_gitlab_git' into 'master' ... 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	2015-03-05 21:53:53 +00:00
Dmitriy Zaporozhets	baae329172	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-05 11:39:16 -08:00
Dmitriy Zaporozhets	e7c90e5825	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-03-05 11:38:40 -08:00
Dmitriy Zaporozhets	0092cb8f59	Merge branch 'cache-project-row' into 'master' ... Cache project row on dashboard, group and user page See merge request !1639	2015-03-05 19:38:10 +00:00
Dmitriy Zaporozhets	c17e11ca27	Bump gitlab_git to fix 500 with annotated tags w/o message	2015-03-05 11:35:36 -08:00
Robert Schilling	9e93792167	Merge pull request #8915 from gemnasium/update-gemnasium-to-0-2-5 ... Update gemnasium-gitlab-service gem	2015-03-05 20:09:32 +01:00
Douwe Maan	671c31348f	Merge branch 'add-more-hipchat-notifications' into 'master' ... 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:  After:   See merge request !350	2015-03-05 18:32:58 +00:00
Dmitriy Zaporozhets	cf4fcf2521	Merge branch 'fix-checkbox-align' into 'master' ... 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  --- ## After  --- 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	2015-03-05 18:01:55 +00:00
Dmitriy Zaporozhets	38862308f0	Cache project row on dashboard, group and user page	2015-03-05 09:43:41 -08:00
Stan Hu	f12ec5f4e8	Add merge and issue event notification for HipChat	2015-03-05 08:23:38 -08:00
Robert Schilling	119ebe30a6	Merge pull request #8918 from rumpelsepp/update-rugments ... Update rugments, fixes #8900	2015-03-05 12:58:24 +01:00
Stefan Tatschner	730a49afc2	Update rugments, fixes #8900	2015-03-05 11:09:08 +01:00
Dmitriy Zaporozhets	6296f65d65	Merge branch 'collapsed-projects-list' into 'master' ... 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	2015-03-05 03:34:55 +00:00
Dmitriy Zaporozhets	d07b2e09fe	Merge branch 'timeout' into 'master' ... 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	2015-03-05 02:28:58 +00:00
Dmitriy Zaporozhets	7b9b9f704e	Fix project create link on group page	2015-03-04 18:26:49 -08:00
Dmitriy Zaporozhets	65105ff3bb	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	2015-03-04 17:22:55 -08:00
Dmitriy Zaporozhets	694ac54862	Merge branch 'update-spring' into 'master' ... Update spring to 1.3.3 See merge request !1635	2015-03-05 00:16:50 +00:00
Dmitriy Zaporozhets	7a8fcc738b	Merge branch 'annotate-models' into 'master' ... Re-annotate models See merge request !1634	2015-03-04 23:59:55 +00:00
Dmitriy Zaporozhets	94229f24c7	Update spring to 1.3.3	2015-03-04 15:10:31 -08:00
Stan Hu	6ddd45948f	Make Irker service use the supported events check	2015-03-04 22:31:28 +00:00
Douwe Maan	516bcabbf4	Increase timeout for Git-over-HTTP requests.	2015-03-04 23:20:47 +01: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	00778c0731	Move items to the correct version in the changelog.	2015-03-04 13:45:27 -08:00
Marin Jankovski	02f17ce1b3	Update changelog.	2015-03-04 13:44:11 -08:00
Marin Jankovski	46f9417324	Update the Changelog.	2015-03-04 13:43:52 -08:00
Dmitriy Zaporozhets	21d660a591	Merge branch 'web_hook_extend' into 'master' ... Web Hook sends email of pusher See merge request !1630	2015-03-04 21:42:31 +00:00
Marin Jankovski	67eb6e9221	Merge branch 'changelog-fix' into 'master' ... Add Service Templates to CHANGELOG See merge request !1633	2015-03-04 21:41:58 +00:00
Dmitriy Zaporozhets	c2ac790de6	Merge branch 'triage-link' into 'master' ... Advise on how to help others. See merge request !1632	2015-03-04 21:36:53 +00:00
Dmitriy Zaporozhets	21a6944b15	Merge branch 'bump_gitlab_git' into 'master' ... Bump gitlab_git to rc15 For #2033 See merge request !1631	2015-03-04 21:35:21 +00:00
unknown	6fd0600685	Bugfix #1096	2015-03-04 22:05:15 +02:00
Patricio Cano	52211ea72a	Added Service Templates to CHANGELOG and fixed typo.	2015-03-04 12:00:53 -08:00
Sytse Sijbrandij	c842c45283	Advise on how to help others.	2015-03-04 11:24:14 -08:00
Dmitriy Zaporozhets	e916f1c295	Merge branch 'dashboard-milestones' into 'master' ... Add dashboard milestones. Closes #1422.  See merge request !1621	2015-03-04 19:12:47 +00:00
Dmitriy Zaporozhets	61acaff5a1	Bump gitlab_git to rc15	2015-03-04 10:49:48 -08:00
Dmitriy Zaporozhets	7f97c320f9	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-04 10:48:42 -08:00
Valery Sizov	3d9a766d9f	Web Hook sends email of pusher	2015-03-04 20:29:25 +02:00
Marin Jankovski	890f14786a	Add link to smtp documentation.	2015-03-04 09:04:23 -08:00
Robert Schilling	ba215e9cd5	Merge branch 'connect_gitlab_buttons_doc' into 'master' ... Connect GitLab buttons doc The "GitLab buttons in Gmail" documentation was not linked from anywhere else. Instead of assuming that these docs are not current, or should not be accessible, I've linked to them from doc/integrations/README.md. If linking is the less desirable approach, please advise. See merge request !339	2015-03-04 15:52:52 +00:00
Ewan Edwards	535a3fa470	Merge branch 'connect_gitlab_buttons_doc' of gitlab.com:perforce/gitlab-ce into connect_gitlab_buttons_doc	2015-03-04 07:25:06 -08:00
Ewan Edwards	fe6fb32fe6	Moved the Gmail integration line into the list of available integrations.	2015-03-04 07:24:36 -08:00