summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | add common method to force utf8 and force oauth properties to be utf8Onur Küçük2015-05-034-35/+100
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'change-primary-email' into 'master'Dmitriy Zaporozhets2015-05-036-18/+46
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-306-18/+46
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'restrict-signups-to-domains' into 'master'Dmitriy Zaporozhets2015-05-0310-4/+133
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-0210-4/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Add period at snippet visibilty descriptionRobert Schilling2015-05-031-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-05-03248-734/+1749
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'rs-test-env-fixes' into 'master'Robert Speicher2015-05-021-1/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't delete gitlab-test-fork folder after every test run 72a7febeada2c58c98caee8bb7ce18886a7c0868 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
| | * | | | | | | | | Don't delete gitlab-test-fork folder after every test runRobert Speicher2015-05-021-1/+2
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'make-reply-to-work-everywhere' into 'master'Robert Speicher2015-05-024-8/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | Make Reply-To config apply to change e-mail confirmation and other notificationsStan Hu2015-05-014-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556
| * | | | | | | | | Merge branch 'you-get-a-title-and-you-get-a-title-and-everyone-gets-a-title' ↵Dmitriy Zaporozhets2015-05-02206-412/+436
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | Fix title on user page.you-get-a-title-and-you-get-a-title-and-everyone-gets-a-titleDouwe Maan2015-05-012-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Add helpers for header title and sidebar, and move setting those from ↵Douwe Maan2015-05-0133-129/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controllers to layouts.
| | * | | | | | | | | Capitalize "X" in "New X".Douwe Maan2015-04-3012-12/+12
| | | | | | | | | | |
| | * | | | | | | | | Don't ignore any folder called tags :|Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Set head panel title of help section.Douwe Maan2015-04-303-2/+8
| | | | | | | | | | |
| | * | | | | | | | | Humanize help page titles.Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Have tree page title read "Files" for root.Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Capitalize "Git Access" in page title.Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Include ref in network page title.Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Include commit message in page title.Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Plural instead of singular.Douwe Maan2015-04-303-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Fix snippest sidebar when signed out.Douwe Maan2015-04-301-5/+6
| | | | | | | | | | |
| | * | | | | | | | | Fix Profiles::PasswordsController.Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | before_action > before_filter.Douwe Maan2015-04-301-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Remove an old determine_layout call.Douwe Maan2015-04-301-2/+0
| | | | | | | | | | |
| | * | | | | | | | | Add a page title to every page.Douwe Maan2015-04-30197-390/+426
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'rs-more-pipeline-filters' into 'master'Dmitriy Zaporozhets2015-05-0225-298/+1175
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | Improve/add specs for `Project#get_issue` and `#issue_exists?`rs-more-pipeline-filtersRobert Speicher2015-05-012-20/+43
| | | | | | | | | | | |
| | * | | | | | | | | | Change `external_issue_tracker.blank?` to `!external_issue_tracker`Robert Speicher2015-04-301-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Remove title_for_issue helperRobert Speicher2015-04-304-35/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Remove special handling for the `&#39;` problemRobert Speicher2015-04-303-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | | | | Add Project#get_issueRobert Speicher2015-04-303-19/+18
| | | | | | | | | | | |
| | * | | | | | | | | | Rename SCHEME_PATTERN to LINK_PATTERNRobert Speicher2015-04-301-5/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Autolink short URLsRobert Speicher2015-04-303-4/+13
| | | | | | | | | | | |
| | * | | | | | | | | | Add jira_project project factoryRobert Speicher2015-04-302-20/+19
| | | | | | | | | | | |
| | * | | | | | | | | | Update Autolink SCHEME_PATTERNRobert Speicher2015-04-301-1/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Doc typoRobert Speicher2015-04-301-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Fix header_should_have_correct_id_and_link for featuresRobert Speicher2015-04-301-2/+6
| | | | | | | | | | | |
| | * | | | | | | | | | More gitlab_markdown_helper_spec cleanupRobert Speicher2015-04-301-56/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Escape normal text in our Redcarpet rendererRobert Speicher2015-04-301-1/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Update the Gitlab::Markdown docsRobert Speicher2015-04-301-25/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Add Gitlab::Markdown::SanitizationFilterRobert Speicher2015-04-305-65/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just extends the HTML::Pipeline::SanitizationFilter with our custom whitelist.
| | * | | | | | | | | | Add Gitlab::Markdown::AutolinkFilterRobert Speicher2015-04-305-17/+202
| | | | | | | | | | | |
| | * | | | | | | | | | Fix header styles for anchors generated by TableOfContentsFilterRobert Speicher2015-04-301-1/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Add Gitlab::Markdown::TableOfContentsFilterRobert Speicher2015-04-306-28/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes header and table of contents processing from Redcarpet renderer.
| | * | | | | | | | | | Add a feature spec for our entire Markdown parsing stackRobert Speicher2015-04-302-0/+572
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'kl-docfix' into 'master'Robert Schilling2015-05-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | Add link to services api doc.Kevin Lyda2015-04-201-0/+1
| | | | | | | | | | | |
View Lorry Controller Status