14614 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	a6bb345d58	Add DevKit and development README links to CONTRIBUTING.md	2015-03-08 16:34:26 -07:00
Dmitriy Zaporozhets	f930cf8461	Merge branch 'dev-ui' into 'master' ... GitLab UI development kit and UI guide help section Page with UI elements get generated from current css so you can immediately check how your css changes affects common ui elements. Because it requires GitLab runnning I cannot put it to documentation so I just put link to localhost from development section cc @developers @sabba @sytse See merge request !1653	2015-03-08 23:18:32 +00:00
Dmitriy Zaporozhets	f3d78ee31a	Add markdown info to UI dev kit page	2015-03-08 15:21:47 -07:00
Dmitriy Zaporozhets	1b5ca280d8	Merge two css files with same name	2015-03-08 15:21:28 -07:00
Dmitriy Zaporozhets	a3e18d871d	Merge branch 'mobile-improvements' into 'master' ... Mobile improvements for user page * hide calendar on small screens * hide sidebar and show button to toggle it Fixes #2101 See merge request !1652	2015-03-08 22:00:05 +00:00
Dmitriy Zaporozhets	69d2e1d829	Add UI guide to GitLab development help	2015-03-08 14:56:45 -07:00
Dmitriy Zaporozhets	b5c3e1a431	Add GitLab UI development kit	2015-03-08 14:46:22 -07:00
Dmitriy Zaporozhets	2e99d7c915	Prevent date overflow on issue page on mobile devices	2015-03-08 12:15:09 -07:00
Dmitriy Zaporozhets	df13c9cac9	Hide user page sidebar for mobilde devices	2015-03-08 12:05:15 -07:00
Dmitriy Zaporozhets	1475cb9aaa	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-03-07 11:24:21 -08:00
Dmitriy Zaporozhets	ed616f23d5	Merge branch 'css-cleanup' into 'master' ... Reduce amount of custom css and increase usage of default bootstrap * Copy variables template file for configuring bootstrap variables * Move layout and bootstrap to `base/` directory and explicitly set import order * Apply some styles from flatly theme * Replace bs-callout with alert * Refactor gitlab css state colors * Cleanup css variables * Remove custom css for panels and navs See merge request !1651	2015-03-07 19:20:41 +00:00
Dmitriy Zaporozhets	be3edeb6a1	Small UI improvements after css refactoring	2015-03-07 10:35:17 -08:00
Robert Schilling	4538719df0	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-07 16:35:02 +01:00
Dmitriy Zaporozhets	e2b8025abe	Increase input padding and fit issue form in laptop screen	2015-03-07 01:06:16 -08:00
Dmitriy Zaporozhets	4f3d704845	Move mixins and bootstrap css to base directory	2015-03-07 00:29:25 -08:00
Dmitriy Zaporozhets	433b4c76fc	Apply some styles from flatly theme	2015-03-07 00:28:53 -08:00
Robert Schilling	0f66b32965	Merge branch 'master' into 'master' ... Fix editor in IE producing errors #1096 IE seems to handle form submission oddly. It gets fired twice - once from javascript and once from the form click, producing 2 identical requests and causing #1096. Similar issues: http://stackoverflow.com/questions/14373800 Returning false from the click event seems to fix it and shouldn't cause any side-effects. See merge request !366	2015-03-07 08:00:57 +00:00
Robert Schilling	8d9823ab47	Merge pull request #8928 from Mic92/master ... use constant-time string compare for internal api authentication	2015-03-07 08:22:58 +01:00
Dmitriy Zaporozhets	887cf5c710	Better name for pages css dir	2015-03-06 21:40:23 -08:00
Dmitriy Zaporozhets	ceb8f9dfeb	Remove custom css for panels and navs	2015-03-06 21:15:15 -08:00
Dmitriy Zaporozhets	3cbc0b1c6d	Cleanup css variables	2015-03-06 20:02:34 -08:00
Dmitriy Zaporozhets	cd73b26e07	Refactor gitlab css state colors	2015-03-06 19:02:12 -08:00
Dmitriy Zaporozhets	3bfd53149c	Replace bs-callout with alert	2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets	3cf4359b00	Merge branch 'mass-change-comments' into 'master' ... Send notifications and leave system comments when bulk updating issues. Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/1885. See merge request !1646	2015-03-07 01:06:44 +00: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.  (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	1cc41ce1ad	Merge branch 'normalize-slack-hipchat-messages' into 'master' ... Add tag push notifications to HipChat and Slack messages and normalize output of messages to be consistent Add tag_push event notification to HipChat and Slack services. For each service, normalize message output to use: - User name instead of username - Include first line of title in message description - Link to "Issue #X" instead of "#X" See merge request !370	2015-03-06 21:23:41 +00:00
Jörg Thalheim	9f089ac48c	use constant-time string compare for internal api authentication ... Ruby str_equal uses memcmp internally to compare String. Memcmp is vunerable to timing attacks because it returns early on mismatch (on most x32 platforms memcmp uses a bytewise comparision). Devise.secure_compare implements a constant time comparision instead.	2015-03-06 20:06: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
Dmitriy Zaporozhets	0625d68f75	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-06 08:28:26 -08:00
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
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