summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Update specs.commit-graphs-by-emailDouwe Maan2015-05-251-3/+5
|
* Add support for Webhook note eventsStan Hu2015-05-215-0/+6
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/6745
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJob van der Voort2015-05-211-0/+14
|\
| * Subclass TaskList::Filter to fix a bugrs-issue-1645Robert Speicher2015-05-201-0/+14
| | | | | | | | | | | | | | | | | | Instead of using a fork, we subclass the filter and only apply the `task-list` class to list items that actually are task lists. Closes #1645 See https://github.com/github/task_list/pull/60
* | Disabled expansion of top/bottom blobs for new file diffsAlex Connor2015-05-211-0/+10
|/
* Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ↵Marin Jankovski2015-05-191-1/+1
|\ | | | | | | jirutka-shell-secret-path
| * Allow to configure gitlab_shell_secret locationJakub Jirutka2015-05-161-1/+1
| |
* | Simplify and unify helpers for rendering markupJakub Jirutka2015-05-182-1/+8
| |
* | Rename MarkdownHelper to MarkupHelperJakub Jirutka2015-05-181-7/+7
| |
* | Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)Jakub Jirutka2015-05-184-2/+88
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-183-7/+12
|\ \
| * | Fix specs.unauthorized-participantsDouwe Maan2015-05-153-7/+12
| |/
* | Add tests for password reset token changesVinnie Okada2015-05-161-33/+24
| |
* | Explain reset token expiration in emailsVinnie Okada2015-05-162-0/+51
|/ | | | | Tell new users when their password reset token expires and provide a link to get a new one.
* Merge branch 'dashboard-references' into 'master'Dmitriy Zaporozhets2015-05-151-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix reference links in dashboard activity and ATOM feeds.dashboard-referencesDouwe Maan2015-05-141-1/+1
| |
* | Merge branch 'project_api_order' into 'master'Dmitriy Zaporozhets2015-05-141-0/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656
| * | Add order option for projects APIValery Sizov2015-05-141-0/+9
| |/
* | Minor RelativeLinkFilter cleanuprs-relative-link-filterRobert Speicher2015-05-131-68/+63
|/
* Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-131-11/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix GitAccess.text-batch-1Douwe Maan2015-05-131-11/+3
| |
* | Merge pull request #9276 from jirutka/relative_link_filterDmitriy Zaporozhets2015-05-132-73/+120
|\ \ | | | | | | Extract handling of relative file links to its own HTML filter
| * | Add spec for RelativeLinkFilterJakub Jirutka2015-05-122-73/+120
| | |
* | | Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commitJeroen van Baarsen2015-05-131-2/+16
|\ \ \ | |_|/ |/| | Call merge request web hook for each commits
| * | Call merge request web hook for each commitsArthur Gautier2015-05-131-2/+16
| | | | | | | | | | | | | | | | | | | | | Call merge request web hook every times a new commit hits the source branch Signed-off-by: Arthur Gautier <baloo@gandi.net>
* | | Merge branch 'fix-avatar-removal' into 'master'Hannes Rosenögger2015-05-123-0/+52
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix bug where avatar filenames were not actually deleted from the database ↵Stan Hu2015-05-073-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'ad-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-05-121-4/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638
| * | | Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_usersDouwe Maan2015-05-121-4/+23
| | |/ | |/|
* | | Merge branch 'rs-system-note' into 'master'Dmitriy Zaporozhets2015-05-123-493/+407
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Reorganize SystemNoteService spec a bitrs-system-noteRobert Speicher2015-05-111-13/+17
| | | |
| * | | Spec SystemNoteService.cross_reference_disallowed?Robert Speicher2015-05-111-2/+26
| | | |
| * | | Simplify Note model specsRobert Speicher2015-05-112-215/+36
| | | |
| * | | Update SystemNoteService method naming conventionsRobert Speicher2015-05-111-128/+129
| | | | | | | | | | | | | | | | | | | | Now the verb comes first, and there is no restriction on singular/plural.
| * | | Remove legacy special case for emphasized reference notesRobert Speicher2015-05-111-36/+0
| | | |
| * | | Add a SystemNoteService classRobert Speicher2015-05-113-261/+363
| | | | | | | | | | | | | | | | | | | | 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.
| * | | Note's voting specs don't need to persist to the databaseRobert Speicher2015-05-101-18/+16
| |/ /
* | | Handle password reset for users with 2FA enabled2faRobert Speicher2015-05-112-2/+55
| | |
* | | Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-091-0/+126
| | |
* | | Prevent "You are already signed in." error message upon 2FA loginRobert Speicher2015-05-091-1/+18
| | |
* | | Generate 10 2FA backup codes instead of the default of 5Robert Speicher2015-05-091-2/+2
| | |
* | | Add :two_factor trait to User factoryRobert Speicher2015-05-092-8/+11
| | |
* | | Fix 2FA backup code removalRobert Speicher2015-05-091-7/+5
| | |
* | | Re-annotate User modelRobert Speicher2015-05-091-0/+5
| | |
* | | Refactor SessionsControllerRobert Speicher2015-05-091-0/+8
| | | | | | | | | | | | | | | Also adds test case for providing an invalid 2FA code and then a valid one without re-entering username and password.
* | | Make two-factor login work and add a feature specRobert Speicher2015-05-091-0/+82
|/ /
* | 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
View Lorry Controller Status