25776 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jacob Schatz	aa4da38435	Make label search work with JSON data	2016-03-25 08:04:57 -04:00
Jacob Schatz	a76ee508fb	Ajax call to milestones via new dropdowns	2016-03-25 08:04:57 -04:00
Jacob Schatz	ff86138d76	Sidebar milestone updatable via JSON	2016-03-25 08:04:57 -04:00
Jacob Schatz	1c8fff965c	Adds milestone API JS call	2016-03-25 08:04:09 -04:00
Jacob Schatz	16ba5eb4d8	Updates sidebar milestone to use new dropdowns	2016-03-25 08:03:16 -04:00
Achilleas Pipinellis	63c8a05bf7	Merge branch 'clarify_lfs' into 'master' ... Clarify LFS configuration A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default. See merge request !3388	2016-03-25 09:11:08 +00:00
Sytse Sijbrandij	28c94ee955	Describe CI stuff.	2016-03-24 17:43:37 -07:00
Robert Speicher	3028a7d25a	Merge branch 'issue_14610' into 'master' ... Fix cancel button on issuable edit form See merge request !3392	2016-03-24 20:13:53 +00:00
Alfredo Sumaran	35ef7ff6cb	Fix link when issuable is new	2016-03-24 14:40:20 -05:00
Alfredo Sumaran	7f43049012	Fix cancel link on issuable edit form	2016-03-24 14:29:09 -05:00
Douwe Maan	5a460c3796	Merge branch 'fix-comments-on-confidential-issues-show-activity-feed-for-non-members' into 'master' ... Comments on confidential issues doesn't show in activity feed to non-members Closes #14568 See merge request !3375	2016-03-24 18:06:42 +00:00
Douglas Barbosa Alexandre	39a51f9e1c	Rename Event#proper? to Event#visible_to_user?	2016-03-24 14:24:22 -03:00
Douglas Barbosa Alexandre	239560331a	Comments on confidential issues doesn't show in activity feed to non-members	2016-03-24 14:22:01 -03:00
Jacob Schatz	6b95be1ddd	Merge branch 'project-dropdown-width' into 'master' ... Fixed issue with width of project select dropdown Before:   After:   See merge request !3386	2016-03-24 15:59:27 +00:00
Drew Blessing	2da8204ff5	Clarify LFS configuration	2016-03-24 10:00:27 -05:00
Jacob Schatz	c87adc4e4d	Merge branch 'sidebar-bold-fix' into 'master' ... Fixed bold in sidebar  This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289 See merge request !3358	2016-03-24 14:33:00 +00:00
Jacob Schatz	f565e126d2	Merge branch 'fix-password-settings-regressions' into 'master' ... Shows password form when signed in with linked account Closes #14379 Doing this to get the builds passing for !3325 See merge request !3381	2016-03-24 14:26:50 +00:00
Douwe Maan	baf41fd7cf	Merge branch 'lease-design-comments' into 'master' ... Explain why ExclusiveLease has no #cancel [ci skip] See merge request !3383	2016-03-24 14:12:20 +00:00
Douwe Maan	e9fe42c477	Merge branch 'add-tooltip-to-issue-new-branch-button-with-create-branch-issue-title-123-14565' into 'master' ... Add tooltip to new branch button Closes #14565 See merge request !3380	2016-03-24 14:07:44 +00:00
Phil Hughes	91d5876ea2	Fixed issue with width of project select dropdown	2016-03-24 13:43:35 +00:00
Jacob Vosmaer	be3675c8ac	Explain why ExclusiveLease has no #cancel ... [ci skip]	2016-03-24 13:51:33 +01:00
Zeger-Jan van de Weg	221c917c6c	Add tooltip to new branch button	2016-03-24 13:00:33 +01:00
Phil Hughes	4d7671e74d	HAML style fix	2016-03-24 11:38:00 +00:00
Phil Hughes	6a5b3a5c8f	Shows password form when signed in with linked account ... Closes #14379	2016-03-24 11:22:44 +00:00
Rémy Coutable	ffe5ac41b8	Merge branch 'fix-frontend-specs' into 'master' ... Fix specs broken by !3270 and !3337. To be fair: - !3270 modifies CSS but `scss-lint` job was allowed to fail in the MR, while not allowed in `master` - !3337 modifies HTML but the broken test was only in `master` at the time /cc @alfredo1 @iamphill See merge request !3378	2016-03-24 10:20:21 +00:00
Rémy Coutable	2824972c36	Fix specs broken by !3270 and !3337.	2016-03-24 10:10:46 +01:00
Jacob Schatz	4a4a79aa9e	Merge branch 'dropdown-alignment-fixes' into 'master' ... Dropdown pixel perfect 🎉 Closes #14333, #14331, #14472, #14515 See merge request !3337	2016-03-23 22:13:31 +00:00
Jacob Schatz	31ba9c303b	Merge branch 'scss-style-guide-fixes' into 'master' ... Documentation: SCSS Style Guide fixes Fixed a typo and added a section on ignoring issues. [ci skip] See merge request !3263	2016-03-23 21:13:14 +00:00
connorshea	2c9f6cfa42	SCSS Style Guide fixes. ... Fix a typo and add a section on ignoring issues. [ci skip]	2016-03-23 14:39:12 -06:00
Jacob Schatz	4798b927ab	Merge branch 'issue_7959' into 'master' ... Crop avatars on the client before upload <img src="/uploads/535d69956cc5904870ae5d95132a35af/Screen_Shot_2016-03-17_at_9.55.56_AM.png" width="700"> closes #7959 closes #600 See merge request !3270	2016-03-23 20:29:30 +00:00
Jacob Schatz	b45423c5fb	Merge branch 'issue-sidebar-overlap' into 'master' ... Issue sidebar overlaps on tablet Closes #14180  See merge request !3299	2016-03-23 20:10:00 +00:00
Robert Speicher	f49e9e8f77	Merge branch 'update-issues-tests' into 'master' ... Multi-update issues tests There were no tests for updating multiple issues at a time - this fixes that 👍 See merge request !3357	2016-03-23 19:59:42 +00:00
Jacob Schatz	00246d3f01	Merge branch 'fix_missing_tooltip_next_to_project_title' into 'master' ... Fix missing tooltip in project title closes #14516  See merge request !3351	2016-03-23 19:16:05 +00:00
Alfredo Sumaran	6c20e9a5bb	Update CHANGELOG	2016-03-23 13:34:24 -05:00
Douwe Maan	30246f1dc2	Merge branch 'rs-rails-routes' into 'master' ... Add special cases for built-in Rails routes in development See merge request !3369	2016-03-23 18:33:48 +00:00
Robert Speicher	33b1bbba67	Merge branch 'fix-application-settings' into 'master' ... Fixed error with applications delete anonymous token form Closes #14509 See merge request !3362	2016-03-23 18:12:01 +00:00
Phil Hughes	07a1da7e40	Removed hover background that wasn't needed	2016-03-23 17:21:02 +00:00
Phil Hughes	2d7183bbe8	Fixed failing tests ... Moved the scss out of a mixin as it was really confusing the hell out of the CSS	2016-03-23 17:15:14 +00:00
Phil Hughes	e94482d149	Issue sidebar overlaps on tablet	2016-03-23 17:15:14 +00:00
Alfredo Sumaran	128c109a34	Move cropper.css to vendor folder	2016-03-23 11:56:14 -05:00
Alfredo Sumaran	3bab5976c0	Move cropper.js to vendor folder	2016-03-23 11:54:04 -05:00
Robert Speicher	0e85a8b816	Merge branch 'issue_14453' into 'master' ... Strip commit title when creating revert commit. Fixes #14453 See merge request !3352	2016-03-23 16:46:23 +00:00
Robert Speicher	1f5d5af423	Merge branch 'fix-milestone-upcoming' into 'master' ... Fix Milestone.upcoming The order wasn't happening because of `default_scope`. Blegh. See merge request !3364	2016-03-23 15:51:29 +00:00
Jacob Schatz	384a82f1a3	Merge branch 'dropdown-right-align' into 'master' ... Dropdown alignment Hopefully the JS will stop this happening in future as well! Closes #14386  See merge request !3298	2016-03-23 15:24:21 +00:00
Douwe Maan	b651a4fd41	Fix Milestone.upcoming	2016-03-23 15:09:58 +00:00
Rémy Coutable	a4fa5d3e3d	Updated 8.6.1 changelog ... [ci skip]	2016-03-23 15:58:02 +01:00
Achilleas Pipinellis	06976bf1c5	Merge branch 'doc/technical-debt-label' into 'master' ... Add description of technical debt label in docs Description for a technical debt label and workflow, as discussed in https://dev.gitlab.org/gitlab/organization/issues/714. See merge request !3265	2016-03-23 14:14:38 +00:00
Phil Hughes	c23d9ab4ed	Fixed error with applications delete enonymous token form ... Closes #14509	2016-03-23 13:59:54 +00:00
Douwe Maan	a29c195423	Merge branch 'split-with-2' into 'master' ... Make sure we get only two returns @DouweM The other change I made which has nothing to do with Gitlab::Email::Receiver See merge request !3360	2016-03-23 13:58:21 +00:00
Douwe Maan	c78f83b5ef	Merge branch 'avoid-name-shadowing' into 'master' ... Avoid using the same name between methods and variables @DouweM This is the one with renaming. See merge request !3359	2016-03-23 13:45:26 +00:00