Commit Graph
254 Commits
Author SHA1 Message Date
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts:
#	Gemfile.lock
2015-09-15 22:40:35 +02:00
Kamil Trzcinski fe42de3a48 Fix: features/ci/admin/runners_spec.rb 2015-09-15 22:15:28 +02:00
Kamil Trzcinski 29b3279a95 Fix: features/ci/events_spec.rb once again 2015-09-15 22:04:42 +02:00
Kamil Trzcinski 6cc15cf721 Fix: features/ci/triggers_spec.rb 2015-09-15 21:23:45 +02:00
Kamil Trzcinski 64ef1b3dcd Fix: features/ci/triggers_spec.rb 2015-09-15 21:22:51 +02:00
Kamil Trzcinski 5285e01d54 Fix: features/ci/runners_spec.rb 2015-09-15 21:21:46 +02:00
Kamil Trzcinski 9621f433a7 Fix: features/ci/projects_spec.rb 2015-09-15 21:06:12 +02:00
Kamil Trzcinski a598bd91f9 Refactor ci_admin_event and fix features/ci/events_spec.rb 2015-09-15 20:56:20 +02:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Dmitriy Zaporozhets b35d5a6a16 Merge branch 'public_profiles' into 'master'
Make all group public

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#

Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1247
2015-09-14 15:28:42 +00:00
Dmitriy Zaporozhets 66840f03cc Fix tests for group access 2015-09-14 12:15:11 +02:00
Dmitriy Zaporozhets 0615de013d Fix ci commits features specs 2015-09-11 13:05:31 +02:00
Dmitriy Zaporozhets a8dd4d36e2 Fix build features specs 2015-09-11 12:52:56 +02:00
Dmitriy Zaporozhets 4e7b47dde1 Convert ci features specs to v3 2015-09-10 16:56:21 +02:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets cc4ef4da11 Refactor CI tests 2015-09-09 14:17:16 +02:00
Douwe Maan e4b30f9db3 Fix help access spec 2015-09-09 10:22:19 +01:00
Valery Sizov b7431ec042 Make all group public 2015-09-09 11:27:03 +03:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Robert Speicher 2930041886 Make sure the gfm helper passes the required options
This adds some duplication, but this helper is temporary.
2015-08-31 18:09:18 -04:00
Robert Speicher 4340dd3eeb Decouple Gitlab::Markdown from the GitlabMarkdownHelper
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
2015-08-27 14:17:26 -07:00
Robert Speicher c401543d02 Fix failing spec 2015-08-25 15:57:55 -07:00
Robert Speicher 2c3e42e4a4 Remove user_color_scheme_class
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
2015-08-25 15:32:38 -07:00
Robert Speicher 907860ed3d Remove the gfm_with_options helper
It was redundant because `gfm` also took options.
2015-08-12 23:32:16 -04:00
Douwe Maan 674e1c7458 Fix spec 2015-08-06 17:15:37 +02:00
Robert Speicher 8c957b54f5 Fix setup/teardown for Markdown feature spec
Prior, CI seemed to be freezing after running these specs.
2015-07-29 00:06:52 -04:00
Robert Speicher 05f9a6a9c4 Update Markdown feature to allow for multiple pipelines 2015-07-28 18:56:27 -04:00
Robert Speicher 590fca0f06 Move MarkdownFeature to its own support file
This file's about to get much bigger and this removes some of the extra
noise.
2015-07-28 18:56:26 -04:00
Robert Speicher 97cedc5d1b Break up SanitizationFilter feature specs 2015-07-28 18:56:26 -04:00
Robert Speicher 3cafa74387 Use aggregate_failures where appropriate 2015-07-28 18:56:26 -04:00
Robert Speicher 06478ef3ec Minor Markdown feature spec reorganization 2015-07-28 18:56:26 -04:00
Robert Speicher b07ecbb5e3 Simplify AutolinkFilter specs 2015-07-28 18:56:26 -04:00
Stan Hu 5bdcef7b0b Change before(:all) -> let! to avoid leaking data across tests
Closes https://github.com/gitlabhq/gitlabhq/issues/9495
2015-07-28 13:06:13 -07:00
Robert Speicher b42422a7a9 Move spec/features/admin/security_spec to spec/features/security 2015-07-22 00:39:18 -04:00
Robert Speicher b24d5f13a5 Consolidate group access specs into one file 2015-07-22 00:01:17 -04:00
Robert Speicher ff8811c40b Remove redundant Profile access test cases
The user being created was no different than what `be_allowed_for` was
doing behind the scenes so we were essentially testing all user-level
accesses twice.
2015-07-22 00:01:17 -04:00
Robert Speicher 421b06508d Remove be_not_found_for matcher
It was only used in one test, and the test was kind of redundant.
2015-07-22 00:01:17 -04:00
Robert Speicher a2ecfdc585 Move access-related matchers to their own module 2015-07-22 00:01:17 -04:00
Robert Speicher db8f4c0606 Add a button to Admin::Users#show to disable 2FA for that user 2015-07-10 17:18:33 -04:00
Stan HuandRobert Speicher 098ced4faa Improve features to ensure Ajax filter has actually executed 2015-07-08 15:57:24 -04:00
Robert Speicher 098ad0a5b4 Remove "mystery guest" from Milestone filtering features 2015-07-08 15:49:37 -04:00
Robert Speicher cf7c57aaf5 Use stub_application_setting in a few more specs
These specs also failed when run by themselves before this change, so
we've likely got some kind of cross-test contamination going on.
2015-07-06 22:39:56 -04:00
Robert Speicher 4b4351a18c Add feature tag to feature specs
Not to be confused with the RSpec `type: :feature` tag, this tag is used
by the `spec:feature` Rake task for filtering/grouping specs.
2015-07-06 22:39:55 -04:00
Robert Speicher d00cb00d6b Rename NoMilestone to Milestone::None
Also refactors IssuableFinder to avoid redundant title check.
2015-07-06 22:39:55 -04:00
Robert Speicher cfd813402d Remove duplicate feature spec for filtering issues by no milestone 2015-07-06 22:39:55 -04:00
Robert Speicher 3ee3cb24d4 Allow user to filter by Issues/Merge Requests without a Milestone 2015-07-06 22:39:55 -04:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets a5b54f919a Reporter role can manage issue tracker now
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 13:33:02 +02:00
Dmitriy Zaporozhets 06ab7d89f9 Merge branch 'rs-issue-1887' into 'master'
Reorder MergeRequestTabs constructor

The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887

See merge request !892
2015-06-26 16:17:07 +00:00