Commit Graph
22224 Commits
Author SHA1 Message Date
Sullivan SENECHAL 76e720dfa9 Bootstrap 3.3.4 2015-04-27 00:00:17 +02:00
Sullivan SENECHAL 570594a469 Fix '.container or .container-fluid should be the first child inside of a .navbar' issue 2015-04-26 23:32:35 +02:00
Sullivan SENECHAL 4ca2b99f47 Fix "<head> is missing X-UA-Compatible <meta> tag that disables old IE compatibility modes" 2015-04-26 22:49:12 +02:00
Jeroen van Baarsen 618dc4cd7c Merge pull request #9206 from dsander/hipchat-options
Add notify and color options to HipchatService
2015-04-26 22:32:04 +02:00
Dominik Sander 3c3b43b0a0 Add notify and color options to HipchatService
When notify is set to true send messages will trigger a notification for
all room members.
Color changes the background color of the message.
2015-04-26 22:00:51 +02:00
Robert Schilling f0c4c51f83 Merge pull request #9200 from jvanbaarsen/version-10
Version 7.10.0 has been released so its 7.11.0-pre time
2015-04-26 16:27:38 +02:00
Vinnie Okada bd557e4b64 Add new admin settings
Add new global application settings for default project and snippet
visibility levels.
2015-04-26 07:48:19 -06:00
Jeroen van Baarsen 57188d285f Its 7.11.0-pre time
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-26 14:09:22 +02:00
Robert Speicher 652c15b585 Don't use capybara-screenshot in CI environments 2015-04-25 21:33:17 -04:00
Robert Speicher 3875930793 Enable js_errors for Capybara in Spinach and RSpec 2015-04-25 21:33:16 -04:00
Robert Speicher 86edfce442 Move RSpec setup for Capybara to its own support file 2015-04-25 21:33:16 -04:00
Robert Speicher 1e3fc84cd1 Reduce timeout for non-CI features 2015-04-25 21:33:16 -04:00
Robert Speicher 55831a4d50 Move Spinach setup for db_cleaner and capybara to their own files
Also adds capybara-screenshot, which will automatically save the page as
html and an image whenever a feature fails. Handy for debugging.
2015-04-25 21:33:16 -04:00
Robert Speicher 3bb2f37816 Add capybara-screenshot gem 2015-04-25 21:33:15 -04:00
Robert Speicher a64b5e3c60 Convert UserReferenceFilter#link_to_group to use a guard clause 2015-04-25 21:26:43 -04:00
Robert Speicher 2c90579749 Set default_url_options in test environments too 2015-04-25 19:46:05 -04:00
Robert Speicher aa9435cddb Remove duplicate settings for default_url_options
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
2015-04-25 19:46:04 -04:00
Robert Speicher 92783eae2b Refactor UserReferenceFilter#user_link_filter 2015-04-25 18:07:20 -04:00
Robert Speicher 9d3a1d0054 Fix docs for push_result
[ci skip]
2015-04-25 17:44:24 -04:00
Robert Speicher a534af1174 Merge branch 'rs-refactor-reference-extractor' into 'master'
Refactor ReferenceExtractor

See merge request !557
2015-04-25 21:41:00 +00:00
Robert Speicher 07a88040a4 Fix NotificationService spec 2015-04-25 16:46:06 -04:00
Robert Speicher 1e1785cc16 Place the logo's tooltip dynamically
When collapsed it's on the right like everything else, when expanded
it's on the bottom.
2015-04-25 16:03:18 -04:00
Robert Speicher 96593d79f9 Add data-placement attributes for all sidebar links 2015-04-25 16:03:03 -04:00
Robert Speicher d30ceda7de Add collapsed navbar links to the default tooltip selector 2015-04-25 16:00:30 -04:00
Robert Speicher 682ec038ac Rename CommitRange#sha_from_as_param to #suffixed_sha_from 2015-04-25 14:59:47 -04:00
Robert Speicher 165cacce16 Rename CommitRange#inclusive? to #exclude_start? 2015-04-25 14:58:49 -04:00
Robert Speicher 95ca6584d8 Add CommitRange directly to results Hash 2015-04-25 14:46:06 -04:00
Robert Speicher 92c681a53c Remove CommitRange#to_a 2015-04-25 14:45:56 -04:00
Robert Speicher 2207e5a6c9 DRY up ReferenceExtractor 2015-04-25 14:41:07 -04:00
Robert Speicher c0a97d70ef Don't allow nil references to get added to results 2015-04-25 14:41:06 -04:00
Robert Speicher 2403a28b3f Include caret in CommitRange#reference_title 2015-04-25 14:41:06 -04:00
Robert Speicher c11d3c5789 Remove param from CommitRange#to_s 2015-04-25 14:41:06 -04:00
Robert Speicher 81a21e5796 CommitRange improvements 2015-04-25 14:41:06 -04:00
Robert Speicher 6bac823ad4 Update CommitRangeReferenceFilter to use CommitRange class
Also matches CommitReferenceFilter's new behavior of always using short
SHAs in the link text.
2015-04-25 14:41:06 -04:00
Robert Speicher a8e6656481 Add CommitRange class 2015-04-25 14:40:40 -04:00
Robert Speicher 2c8bfedb20 Always use short SHAs as commit reference link text
Now when a user pastes a full SHA like
`d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show
`d7f61aff` for brevity.
2015-04-25 14:40:40 -04:00
Robert Speicher 89775da8e5 Add to_param to mentionable spec's mock 2015-04-25 14:40:40 -04:00
Robert Speicher 8f8a8ab32b Refactor ReferenceExtractor to use pipeline filters 2015-04-25 14:40:12 -04:00
Robert Speicher a6defd1576 Add results to reference filters 2015-04-25 14:39:45 -04:00
Robert Speicher 85082de780 Add pipeline_result to ReferenceFilterSpecHelper 2015-04-25 14:39:44 -04:00
Robert Speicher 879be42862 Initialize the references result Hash in ReferenceFilter 2015-04-25 14:39:44 -04:00
bugagazavr 548f182814 Added X-GitLab-Event header for web hooks 2015-04-25 21:31:52 +03:00
Robert Speicher a11b07f31d Fix "Dashboard > New project" feature 2015-04-25 14:26:04 -04:00
Robert Speicher 38634b4777 There's no longer a reason to re-render the header on Design updates 2015-04-25 14:03:40 -04:00
Robert Speicher e8faf9178a Remove the has_bottom_tooltip class
Bootstrap's tooltip JS can read the placement from a `data-placement`
attribute.

Further, when we supply the `selector` option to `tooltip`, tooltips
will be added to any dynamically-added elements matching the selector,
without us having to re-call the `tooltip` method.
2015-04-25 14:03:40 -04:00
Robert Speicher c597b5d09d Fix Profile > Design live-updating
`ui_blue` wasn't added to the list of classes to remove, so if a user
changed to that theme, any subsequent changes wouldn't be live-updated.

This change refactors Gitlab::Theme a bit to make it harder for this to
happen in the future with new themes.
2015-04-25 14:03:40 -04:00
Robert Speicher 3f2f40aa43 Items with tooltips don't need a 'data-original-title' attribute
Bootstrap's tooltip JS just uses the `title` attribute.
2015-04-25 14:03:40 -04:00
Robert Speicher 66e23b555f Don't override color of code blocks in notes 2015-04-25 14:03:40 -04:00
Robert Speicher e0262ee0a0 Simplify icon style selectors
All FontAwesome icons have an `fa` class, so just use that.
2015-04-25 14:03:40 -04:00
Jeroen van Baarsen 5cb325b501 Merge pull request #9196 from tonicbupt/fix
fix redis 3.0.0
2015-04-25 19:09:52 +02:00