summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-083-33/+41
|
* Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-083-15/+74
|\ | | | | Added X-GitLab-Event header for web hooks
| * Added X-GitLab-Event header for web hooksbugagazavr2015-05-083-15/+74
| |
* | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-0810-139/+287
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
| * | Change wording for task list summariesRobert Speicher2015-05-062-4/+4
| | |
| * | Remove unneeded jasmine setupRobert Speicher2015-05-062-5/+0
| | |
| * | Task List feature and JS specsRobert Speicher2015-05-064-0/+253
| | |
| * | Add TaskList to Markdown feature specRobert Speicher2015-05-062-3/+22
| | |
| * | Remove all references to `parse_tasks`Robert Speicher2015-05-061-109/+0
| | |
| * | Update Taskable to use TaskListRobert Speicher2015-05-061-20/+10
| | |
* | | Merge pull request #9254 from gitlabhq/revert-8800-email-settingsDmitriy Zaporozhets2015-05-081-3/+3
|\ \ \ | |_|/ |/| | Revert "Allow to configure smtp and sendmail in gitlab.yml"
| * | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-061-3/+3
| |/
* | Merge branch 'feature/handle-big-diffs' into 'master'Douwe Maan2015-05-071-1/+53
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve handling of large diffs Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines. See merge request !539
| * | Improve handling of large diffsAlex Lossent2015-05-051-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines.
* | | Merge branch 'fix-default-branch' into 'master'Douwe Maan2015-05-071-1/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the first branch pushed to an empty repository the default HEAD In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change. * Closes #1561 * Closes #1576 * Closes https://github.com/gitlabhq/gitlabhq/issues/8883 See merge request !614
| * | | Make the first branch pushed to an empty repository the default HEAD.Stan Hu2015-05-051-1/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change. * Closes #1561 * Closes #1576 * Closes https://github.com/gitlabhq/gitlabhq/issues/8883
* | | Fix Markdown feature specRobert Speicher2015-05-061-2/+2
| | |
* | | Add Markdown feature specs for markup inside linksrs-issue-1348Robert Speicher2015-05-062-0/+21
| |/ |/| | | | | | | It was already working, just want to make sure we don't break it in the future.
* | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-061-3/+3
|/
* fix gitlab CI linksfix_ci_servicesValery Sizov2015-05-051-0/+2
|
* Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-041-0/+22
|\ | | | | | | | | | | | | | | | | | | | | | | | | Unescape branch names in compare commit The upgrade in GitLab v7.9 to Rails v4.1.9 caused all branch names in the compare commit mode to be escaped (e.g. `/` to `%2F`). The compare mode would not always work when comparing against branch names with a forward slash. Opted to unescape the branch name rather than use a wildcard segment to prevent escaping slashes because it seems like a more sensible URL. The slashes in this case aren't really represented by a tree structure (e.g. /compare/one/two/branch..another/branch/here). * Closes #1399 * Closes https://github.com/gitlabhq/gitlabhq/issues/9105 See merge request !582
| * Unescape branch names in compare commitStan Hu2015-04-301-0/+22
| | | | | | | | | | Closes #1399 Closes https://github.com/gitlabhq/gitlabhq/issues/9105
* | Re-annotate modelsStan Hu2015-05-0321-4/+72
| |
* | Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into ↵Dmitriy Zaporozhets2015-05-033-0/+23
|\ \ | | | | | | | | | jubianchi-api-iid
| * | Query issues, merge requests and milestones with their IID through APIjubianchi2015-05-023-0/+23
| | |
* | | Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets2015-05-032-9/+11
|\ \ \ | | | | | | | | Fix #6417: users with group permission should be able to create groups via API
| * | | Fix #6417: users with group permission should be able to create groups via APIRobert Schilling2015-03-312-9/+11
| | | |
* | | | Merge pull request #9234 from dsander/group-milestones-by-titleDmitriy Zaporozhets2015-05-032-3/+3
|\ \ \ \ | | | | | | | | | | Group milestones by title in the dashboard and all other issue views
| * | | | Group milestones by title in the dashboard and all other issue viewsDominik Sander2015-05-012-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #8756 from zaburt/force_utf8_on_oauth_propertiesDmitriy Zaporozhets2015-05-031-28/+83
|\ \ \ \ | | | | | | | | | | add common method to force utf8 and force oauth properties to be utf8
| * | | | add common method to force utf8 and force oauth properties to be utf8Onur Küçük2015-05-031-28/+83
| |/ / /
* | | | Merge branch 'restrict-signups-to-domains' into 'master'Dmitriy Zaporozhets2015-05-032-0/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | 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-021-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sent through Devise Fix test case that was passing due to a broken `around` statement. Closes #1556
* | | | | Improve/add specs for `Project#get_issue` and `#issue_exists?`rs-more-pipeline-filtersRobert Speicher2015-05-011-19/+42
| | | | |
* | | | | Remove title_for_issue helperRobert Speicher2015-04-301-18/+0
| | | | |
* | | | | Remove special handling for the `'` problemRobert Speicher2015-04-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-4/+4
| | | | |
* | | | | Autolink short URLsRobert Speicher2015-04-302-3/+9
| | | | |
* | | | | Add jira_project project factoryRobert Speicher2015-04-302-20/+19
| | | | |
* | | | | More gitlab_markdown_helper_spec cleanupRobert Speicher2015-04-301-56/+1
| | | | |
* | | | | Add Gitlab::Markdown::SanitizationFilterRobert Speicher2015-04-302-33/+81
| | | | | | | | | | | | | | | | | | | | | | | | | This just extends the HTML::Pipeline::SanitizationFilter with our custom whitelist.
* | | | | Add Gitlab::Markdown::AutolinkFilterRobert Speicher2015-04-301-0/+98
| | | | |
* | | | | Add Gitlab::Markdown::TableOfContentsFilterRobert Speicher2015-04-302-17/+101
| | | | | | | | | | | | | | | | | | | | 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 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-302-0/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show incompatible projects in Google Code import status Using Google Code import with a JSON file that contained only one Subversion project led to confusion over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion. Closes #1531 ## Screenshots Before: ![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png) After with no projects available (notice the button is hidden): ![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png) After with 1 valid and 1 incompatible project: ![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png) See merge request !586
| * | | Show incompatible projects in Google Code import statusStan Hu2015-04-302-0/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | Importing a JSON file with only one Subversion project lead to confusion over whether the system was working. Provide status why these projects could not be imported directly. Closes #1531