Commit Graph
22224 Commits
Author SHA1 Message Date
Achilleas Pipinellis 3f4bbbaf98 Merge branch 'fix_snippet_api_doc' into 'master'
Add snippet visibilty as parameter to API doc, closes #1562

## Description

Snippet visibility level was added to API but was not to its documentation.

Related to following commit: 928fc94c3d

@axil Can you review?

See merge request !601
2015-05-03 14:03:19 +00:00
Robert Schilling 45529c87ef Merge pull request #9237 from bbodenmiller/patch-1
add missing word to changelog
2015-05-03 15:44:46 +02:00
Robert Schilling 187b496425 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-03 15:01:09 +02:00
Robert Schilling 78da7b1c48 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-03 15:00:58 +02:00
Robert Schilling 5f3eef6e56 Add period at snippet visibilty description 2015-05-03 15:00:46 +02:00
Robert Schilling 78aadc9336 Add snippet visibilty as parameter to API doc, closes #1562 2015-05-03 14:56:00 +02:00
Achilleas Pipinellis d12a57f07b Merge branch 'changelog-remove-dup' into 'master'
Remove duplicate CHANGELOG line for v7.10.0

The other one is 3 lines below the removed.

[ci skip]

See merge request !563
2015-05-03 12:20:18 +00:00
Achilleas Pipinellis 62aa05dd0c Merge branch 'master' into 'master'
Update config.yml.example

See merge request !597
2015-05-03 12:05:19 +00:00
Dmitriy Zaporozhets 747232eeda Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into jubianchi-api-iid 2015-05-03 14:34:23 +03:00
Dmitriy Zaporozhets a7ddff8748 Merge pull request #9066 from jirutka/fix-6417
Fix #6417: users with group permission should be able to create groups via API
2015-05-03 14:31:00 +03:00
Dmitriy Zaporozhets e097812f57 Merge pull request #9234 from dsander/group-milestones-by-title
Group milestones by title in the dashboard and all other issue views
2015-05-03 14:29:31 +03:00
Dmitriy Zaporozhets 644b4c97e9 Merge pull request #8756 from zaburt/force_utf8_on_oauth_properties
add common method to force utf8 and force oauth properties to be utf8
2015-05-03 14:25:36 +03:00
Dmitriy Zaporozhets 4291e28af7 Merge branch 'change-primary-email' into 'master'
Allow primary email to be set to an email that you've already added.

Fixes gitlab-com/support-forum#106.

When the user sets their primary email to an email that they've already added to their account, this patch makes sure that secondary email record is destroyed, and a new email record is created for the old primary email. This is based on the assumption that in this case no email was meant to be deleted, but the user simply wanted to change which of their emails is primary.

See merge request !591
2015-05-03 11:00:51 +00:00
Ben Bodenmiller 297efc4ed7 add missing word to changelog 2015-05-03 03:18:29 -07:00
Dmitriy Zaporozhets 0df317f729 Merge branch 'restrict-signups-to-domains' into 'master'
Add application setting to restrict user signups to e-mail domains

This feature was requested long ago:

http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains

This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and prone to mistakes.

Also note that validation is ONLY done on creation to prevent breaking existing users who do not have a whitelisted domain. However, this allows a user to sign-up and change his/her email to a non-whitelisted domain.

Screenshots:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b312046aae03971f37f4247382971fc6/image.png)

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/94bdf3ffaf37c2e8324eff83308f81f0/image.png)

See merge request !598
2015-05-03 10:02:45 +00:00
Robert Schilling 0d0c539c04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-03 10:28:52 +02:00
Onur Küçük 0ae574007d add common method to force utf8 and force oauth properties to be utf8 2015-05-03 00:43:46 +03:00
Robert Speicher b3890749c0 Merge branch 'rs-test-env-fixes' into 'master'
Don't delete gitlab-test-fork folder after every test run

72a7febead added a forked repository cloned to `tmp/tests/gitlab-test-fork` but because it wasn't added to the list of folders not to delete every run, it was being cloned every run and adding extraneous console output.

See merge request !600
2015-05-02 20:32:46 +00:00
Robert Speicher 1c49809bf8 Don't delete gitlab-test-fork folder after every test run 2015-05-02 16:01:33 -04:00
Robert Speicher 703856c75e Merge branch 'make-reply-to-work-everywhere' into 'master'
Make Reply-To config apply to change e-mail confirmation and other notifications sent through Devise

Notifications sent through Devise were using the default From: address, and due to a broken test line nothing was actually being run.

The only way to customize the Devise Reply-To field is to use a custom mailer. Moved the e-mail configuration out of the initializers to accommodate this.

Closes #1556

See merge request !596
2015-05-02 17:48:30 +00:00
Stan Hu eb4f1eb5f5 Add application setting to restrict user signups to e-mail domains
This feature was requested long ago:

http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains

This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.

Only restrict e-mail addresses upon creation
2015-05-02 09:36:52 -07:00
win32 fc79f7382c Update config.yml.example 2015-05-02 11:04:07 +00:00
jubianchi 2c544d43c8 Query issues, merge requests and milestones with their IID through API 2015-05-02 10:44:52 +02:00
Dmitriy Zaporozhets cfbff017d0 Merge branch 'you-get-a-title-and-you-get-a-title-and-everyone-gets-a-title' into 'master'
Add a page title to every page.

![You get a title, and you get a title; everyone gets a title!](https://i.imgflip.com/kvmq8.jpg)

The `page_title` helper pushes the provided string at the end of the title, but because of the order that layouts are rendered in by ActionView, the result is always this:

```
<title from view> |
<title from as specified in the controller or by its layout> |
<title from layouts/_head>
```

For example: `Merge Requests | GitLab.org / Gitlab Community Edition | GitLab`.

All a developer needs to know is to put a `page_title` call describing the page in question at the start of every template.

To get everything where I wanted it to go without too much duplication, I had to make some changes around layouts, sidebars and controllers.

See merge request !593
2015-05-02 07:34:58 +00:00
Dmitriy Zaporozhets 812c7a85df Merge branch 'rs-more-pipeline-filters' into 'master'
More HTML::Pipeline filters

The big part of this MR is a feature that is intended to test the entire Markdown-parsing process from beginning to end. See `spec/support/markdown_feature.rb` and `spec/features/markdown_spec.rb`.

One big thing this MR fixes is not being able to type a `<` or `>` anywhere. It now gets properly escaped.

This MR also adds three more custom HTML::Pipeline filters:

### AutolinkFilter

Similar to the built-in Autolink filter in that it still uses Rinku for standard http and ftp links, but then does some further processing to allow auto-linking of any URI scheme. See internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2239

### SanitizationFilter

Created a simple custom SanitizationFilter that sub-classes the default one and adds our custom whitelisting.

### TableOfContentsFilter

Adds the anchor links to each header. This removes some processing from our Redcarpet renderer.

Closes #800, #1015, #1528, #1549

Closes GitHub [8535](https://github.com/gitlabhq/gitlabhq/issues/8535)

See merge request !584
2015-05-02 07:20:18 +00:00
Stan Hu 4dda17a5bf Make Reply-To config apply to change e-mail confirmation and other notifications
sent through Devise

Fix test case that was passing due to a broken `around` statement.

Closes #1556
2015-05-01 22:57:10 -07:00
Robert Schilling 83bba1f8f9 Merge branch 'kl-docfix' into 'master'
Add link to services api doc.

Just a one-line change to link in the services api doc.

I'm curious though. Only gitlab-ci and hipchat are supported.  Would you accept a pull request for the other services? Actually I [submitted](http://feedback.gitlab.com/forums/176466-general/suggestions/7667256-add-api-calls-for-all-services-in-a-project) that last question to the feedback tool.

See merge request !544
2015-05-01 19:51:51 +00:00
Robert Speicher 99fcf2e6fe Improve/add specs for Project#get_issue and #issue_exists? 2015-05-01 13:29:36 -04:00
Karen Carias 72aa9dd768 Added link to document "Reset root password" 2015-05-01 15:26:00 +00:00
Douwe Maan a2eee3181c Fix title on user page. 2015-05-01 11:33:54 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Jeroen van Baarsen 76f7bdccc0 Merge pull request #8669 from robotroll/patch-1
Update 7.6-to-7.7.md
2015-05-01 08:38:02 +02:00
Dominik Sander e6ee8d0ebe Group milestones by title in the dashboard and all other issue views
This groups milestones by title for issue views like it has been done for
the milestone dashboard/project overview. Before milestones with the
same title would show up multiple times in the filter dropdown and one could
only filter per project and milestone. Now the milestone filter is based
on the title of the milestone, i.e. all issues marked with the same
milestone title are shown.
2015-05-01 01:12:58 +02:00
Dominik Sander 8d17e79d1d Removed unused ApplicationController#set_filter_values method
The instance variables assigned in `set_filter_values` are not used by
anything anymore.
2015-05-01 00:18:40 +02:00
Robert Speicher 66a3c4280d Change external_issue_tracker.blank? to !external_issue_tracker 2015-04-30 17:27:51 -04:00
Robert Speicher 84a7675ea6 Remove title_for_issue helper 2015-04-30 17:27:33 -04:00
Robert Speicher 242bebc134 Remove special handling for the &#39; problem
While `escape_once` will create this HTML entity, Nokogiri always
translates it back before it gets to IssueReferenceFilter, so there
should be no danger of erroneous issue links.
2015-04-30 16:35:27 -04:00
Robert Speicher 0027c2ddd7 Add Project#get_issue 2015-04-30 16:35:27 -04:00
Robert Speicher 466bec7caa Rename SCHEME_PATTERN to LINK_PATTERN 2015-04-30 16:35:27 -04:00
Robert Speicher cd3c24a8f3 Autolink short URLs 2015-04-30 16:35:27 -04:00
Robert Speicher f4fac3ac87 Add jira_project project factory 2015-04-30 16:35:27 -04:00
Robert Speicher 50f707e27a Update Autolink SCHEME_PATTERN 2015-04-30 16:35:26 -04:00
Robert Speicher 9ec8a5f75d Doc typo 2015-04-30 16:35:26 -04:00
Robert Speicher a3fbf34469 Fix header_should_have_correct_id_and_link for features 2015-04-30 16:35:26 -04:00
Robert Speicher fad015764c More gitlab_markdown_helper_spec cleanup 2015-04-30 16:35:26 -04:00
Robert Speicher 421edd3545 Escape normal text in our Redcarpet renderer 2015-04-30 16:35:26 -04:00
Robert Speicher 588267b5e2 Update the Gitlab::Markdown docs 2015-04-30 16:35:26 -04:00
Robert Speicher e46d1cdd8b Add Gitlab::Markdown::SanitizationFilter
This just extends the HTML::Pipeline::SanitizationFilter with our custom
whitelist.
2015-04-30 16:35:25 -04:00
Robert Speicher aa2cc670fe Add Gitlab::Markdown::AutolinkFilter 2015-04-30 16:35:25 -04:00
Robert Speicher 2d9edcada5 Fix header styles for anchors generated by TableOfContentsFilter 2015-04-30 16:35:25 -04:00