home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,970 Commits 48 Branches 340 Tags
fbb5a359fe1bb271a1068ba3c4ca68ca0234be4e
Commit Graph
15970 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeroen van Baarsen fbb5a359fe Merge pull request #8754 from jirutka/fix-project_name_regex 
Fix (project_)name_regex to accept non-ASCII letters and dash
 2015-04-27 17:48:14 +02:00
Jakub Jirutka a1c01bc19b Fix (project_)name_regex to accept non-ASCII letters and dash 2015-04-27 16:38:47 +02:00
Dmitriy Zaporozhets c1a5f4710a Merge pull request #8645 from chulkilee/hipchat-api-version 
Add api version property on hipchat service
 2015-04-27 17:07:54 +03:00
Valery Sizov bc9ba5237c Revert "Added X-GitLab-Event header for web hooks" 
This reverts commit 548f182814.
 2015-04-27 16:29:31 +03:00
Chulki Lee 57c724558d Add api version property on hipchat service 2015-04-27 21:14:04 +09:00
Jeroen van Baarsen bb8c1cadf3 Merge pull request #9209 from Soullivaneuh/bootstrap-update 
Bootstrap 3.3.4
 2015-04-27 13:19:35 +02:00
Jeroen van Baarsen 5b69b2686f Merge pull request #9208 from Soullivaneuh/container-class 
Fix .container position on navbar
 2015-04-27 13:19:16 +02:00
Jeroen van Baarsen 365360098f Merge pull request #9207 from Soullivaneuh/x-ua-compatible 
Fix missing X-UA-Compatible meta tag
 2015-04-27 13:18:35 +02:00
Dmitriy Zaporozhets 278c3ba401 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets 2cbdfbfd1e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-27 11:38:29 +03:00
Dmitriy Zaporozhets 38e2ae5ae0 Merge pull request #8644 from Bugagazavr/hook-events 
Add X-GitLab-Event header for web hooks
 2015-04-27 11:22:33 +03:00
Dmitriy Zaporozhets 7ee1d68e0d Merge pull request #9186 from Senorsen/patch-1 
Fix contributions calendar empty problem under mysql
 2015-04-27 11:20:24 +03:00
Dmitriy Zaporozhets f3ffd7d0b1 Merge branch 'rs-capybara-screenshot' into 'master' 
Add capybara-screenshot gem

This is a handy little gem that automatically saves the page and a screenshot when a Capybara test fails to `tmp/capybara/` so you can easily see why it might have failed without adding your own `save_and_open_page` directive in the code.

Also reduces the timeout for Capybara tests when not in a CI environment.

See merge request !578
 2015-04-27 07:43:45 +00:00
Dmitriy Zaporozhets b4317b1656 Merge branch 'fix-gitorious-importer' into 'master' 
Get Gitorious importer to work again.

Fixes #1504.

See merge request !576
 2015-04-27 07:42:32 +00:00
Dmitriy Zaporozhets 57759c9aee Merge branch 'forked-event' into 'master' 
Use Projects::CreateService to fork projects so that after-create hooks are run.

Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run.

See merge request !575
 2015-04-27 07:41:20 +00:00
Dmitriy Zaporozhets 817d93e860 Merge branch 'snippet-default-visibility' into 'master' 
Add new admin settings

Add new settings to the admin web UI for default project and snippet visibility levels.  See #2027.

### New settings:

![default_visibility_settings](https://dev.gitlab.org/gitlab/gitlabhq/uploads/bd6d296e39ea3c90ca6a5254b8eb1fef/default_visibility_settings.png)

See merge request !1795
 2015-04-27 07:40:33 +00:00
Dmitriy Zaporozhets 6de7f94f00 Merge branch 'rs-minor-styles' into 'master' 
Minor design change grab-bag 🎉

I started with one simple change and found a few more, so here they are.

### Simplify icon style selectors

All FontAwesome icons have an `fa` class, so just use that.

### Don't override color of code blocks in notes

This was a pet peeve of mine.

| Before | After |
|:------:|:-----:|
| ![Screen_Shot_2015-04-23_at_4.14.23_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c77cb0816bf0f05cb8c4105cdd8b3ec6/Screen_Shot_2015-04-23_at_4.14.23_PM.png) | ![Screen_Shot_2015-04-23_at_4.15.44_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/463c1d2052e12444563f5e2c102ac51e/Screen_Shot_2015-04-23_at_4.15.44_PM.png) |

### Items with tooltips don't need a 'data-original-title' attribute

This attribute gets added dynamically by Bootstrap's tooltip JS based on the `title` attribute

### 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.

### 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.

See merge request !569
 2015-04-27 07:36:42 +00:00
Robert Schilling bafcee93b0 Merge pull request #9213 from bbodenmiller/patch-1 
google -> Google
 2015-04-27 09:25:22 +02:00
Ben Bodenmiller 7098b7bbe0 google -> Google 2015-04-26 17:24:09 -07:00
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 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