Commit Graph
2342 Commits
Author SHA1 Message Date
Douwe Maan 5210778d6e Fix specs. 2015-05-15 15:38:05 +02:00
Dmitriy Zaporozhets 9c6f4a2351 Merge branch 'dashboard-references' into 'master'
Fix reference links in dashboard activity and ATOM feeds.

References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.

This MR passes the project in question to the reference parsers in an option.

cc @rspeicher

See merge request !653
2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets 740dc41250 Merge branch 'project_api_order' into 'master'
Add order option for projects API

https://dev.gitlab.org/gitlab/gitlab-ci/issues/222

See merge request !656
2015-05-14 20:25:39 +00:00
Valery Sizov 7c3ca86370 Add order option for projects API 2015-05-14 15:49:09 +03:00
Douwe Maan cd52cef1c0 Fix reference links in dashboard activity and ATOM feeds. 2015-05-14 13:05:33 +02:00
Robert Speicher 7f2fb72a0a Minor RelativeLinkFilter cleanup 2015-05-13 14:08:37 -04:00
Dmitriy Zaporozhets 8ad91d5840 Merge branch 'text-batch-1' into 'master'
Batch 1 of text improvements

Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved.

This batch includes:

- Improve text on error pages.
- Improve Git access error messages.
- Improve description of branch protection levels.
- Improve OAuth signup error message.
- Improve OAuth application flash messages.

cc @rspeicher

See merge request !642
2015-05-13 12:05:17 +00:00
Dmitriy Zaporozhets 740716afd1 Merge pull request #9276 from jirutka/relative_link_filter
Extract handling of relative file links to its own HTML filter
2015-05-13 14:09:57 +03:00
Jeroen van Baarsen 892158f136 Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit
Call merge request web hook for each commits
2015-05-13 11:57:33 +02:00
Douwe Maan c5e4b443ff Fix GitAccess. 2015-05-13 09:46:22 +02:00
Arthur Gautier a927bf56b1 Call merge request web hook for each commits
Call merge request web hook every times a new commit hits the
source branch

Signed-off-by: Arthur Gautier <baloo@gandi.net>
2015-05-13 09:33:20 +02:00
Hannes Rosenögger 1dd0caf4d9 Merge branch 'fix-avatar-removal' into 'master'
Fix bug where avatar filenames were not actually deleted from the database during removal

This would result in a 404 error in certain views.

The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.

Closes #1570

See merge request !620
2015-05-12 14:46:58 +00:00
Dmitriy Zaporozhets 8b9e3af8bf Merge branch 'ad-block_auto_created_users' into 'master'
Don't accidentally unblock auto created users from Active Directory.

Fixes #1581.

See merge request !638
2015-05-12 13:28:33 +00:00
Dmitriy Zaporozhets 1a1e42ad31 Merge branch 'rs-system-note' into 'master'
Add SystemNoteService class

The Note model was basically two models crammed together - one handling user-created notes
(i.e., comments on things) and one handling system-created notes (i.e., references).
This splits out the system-specific stuff to a new SystemNoteService class.

See merge request !595
2015-05-12 10:45:42 +00:00
Douwe Maan 125cb9b866 Don't accidentally unblock auto created users from Active Directory. 2015-05-12 11:26:43 +02:00
Jakub Jirutka 44b82396d1 Add spec for RelativeLinkFilter 2015-05-12 02:12:47 +02:00
Robert Speicher 24bef5e67a Handle password reset for users with 2FA enabled 2015-05-11 14:31:31 -04:00
Robert Speicher 54db527b4c Reorganize SystemNoteService spec a bit 2015-05-11 00:01:16 -04:00
Robert Speicher 8390427583 Spec SystemNoteService.cross_reference_disallowed? 2015-05-11 00:01:16 -04:00
Robert Speicher 19142f4079 Simplify Note model specs 2015-05-11 00:01:16 -04:00
Robert Speicher 686f6855c2 Update SystemNoteService method naming conventions
Now the verb comes first, and there is no restriction on
singular/plural.
2015-05-11 00:01:15 -04:00
Robert Speicher ff3a62aad1 Remove legacy special case for emphasized reference notes 2015-05-11 00:01:15 -04:00
Robert Speicher 48e6fb532a Add a SystemNoteService class
There's a lot of code in the Note model that only deals with creating
system notes, so we're going to split that into its own class.
2015-05-11 00:01:01 -04:00
Robert Speicher 5d08a5a56a Note's voting specs don't need to persist to the database 2015-05-10 23:56:15 -04:00
Robert Speicher 414ddc0021 Clear all 2FA-related fields when user disables the feature 2015-05-09 17:32:49 -04:00
Robert Speicher 5cd526f77f Prevent "You are already signed in." error message upon 2FA login 2015-05-09 17:32:49 -04:00
Robert Speicher c845347b23 Generate 10 2FA backup codes instead of the default of 5 2015-05-09 17:32:48 -04:00
Robert Speicher 5f43cae6ca Add :two_factor trait to User factory 2015-05-09 17:32:48 -04:00
Robert Speicher b050bb5bad Fix 2FA backup code removal 2015-05-09 17:32:48 -04:00
Robert Speicher 661d09a22b Re-annotate User model 2015-05-09 17:32:24 -04:00
Robert Speicher 32971b0af4 Refactor SessionsController
Also adds test case for providing an invalid 2FA code and then a valid
one without re-entering username and password.
2015-05-09 17:32:09 -04:00
Robert Speicher 5520397f04 Make two-factor login work and add a feature spec 2015-05-09 17:32:08 -04:00
Robert Speicher 70bbf093aa Remove class and id attributes from SanitizationFilter whitelist 2015-05-08 12:31:34 -04:00
Valeriy Sizov f682a6adb9 Merge pull request #9214 from Bugagazavr/hook-events
Added X-GitLab-Event header for web hooks
2015-05-08 17:17:01 +03:00
bugagazavr acac788902 Added X-GitLab-Event header for web hooks 2015-05-08 16:49:03 +03:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master'
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
2015-05-08 09:39:48 +00:00
Dmitriy Zaporozhets dc76d102b4 Merge pull request #9254 from gitlabhq/revert-8800-email-settings
Revert "Allow to configure smtp and sendmail in gitlab.yml"
2015-05-08 12:16:40 +03:00
Douwe Maan f5f097b765 Merge branch 'feature/handle-big-diffs' into 'master'
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
2015-05-07 19:29:55 +00:00
Stan Hu bf4b438459 Fix bug where avatar filenames were not actually deleted from the database during removal.
This would result in a 404 error in certain views.

The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.

Closes #1570
2015-05-07 10:00:35 -07:00
Douwe Maan 7a23be3ab7 Merge branch 'fix-default-branch' into 'master'
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
2015-05-07 10:28:50 +00:00
Robert Speicher cb079c8208 Fix Markdown feature spec 2015-05-06 20:43:12 -04:00
Robert Speicher 1108915f75 Change wording for task list summaries 2015-05-06 17:27:10 -04:00
Robert Speicher fdff815a4c Add Markdown feature specs for markup inside links
It was already working, just want to make sure we don't break it in the
future.
2015-05-06 17:21:19 -04:00
Robert Speicher 33836ae02c Remove unneeded jasmine setup 2015-05-06 15:29:46 -04:00
Robert Speicher 51c3393974 Task List feature and JS specs 2015-05-06 13:16:37 -04:00
Robert Speicher c915c7b001 Add TaskList to Markdown feature spec 2015-05-06 13:00:13 -04:00
Robert Speicher 6883e6e084 Remove all references to parse_tasks 2015-05-06 12:58:28 -04:00
Robert Speicher e167f28549 Update Taskable to use TaskList 2015-05-06 12:58:28 -04:00
Dmitriy Zaporozhets 317ed1fa90 Revert "Allow to configure smtp and sendmail in gitlab.yml" 2015-05-06 17:39:18 +03:00
Jakub Jirutka b4be7aed77 Allow to configure smtp and sendmail in gitlab.yml 2015-05-06 13:15:33 +02:00