summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Collapse)AuthorAgeFilesLines
* Fix validation of duplicate new variablesdynamic-pipeline-variablesMatija Čupić2018-02-051-0/+23
|
* Extract Variables controllers specs to shared_examplesMatija Čupić2018-02-051-0/+100
|
* Merge branch '24167__color_label' into 'master'Douwe Maan2018-02-021-0/+21
|\ | | | | | | | | | | | | Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095
| * Add Colors to GitLab Flavored MarkdownTony Rom2018-01-291-0/+21
| |
* | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-023-8/+4
| | | | | | | | including/extending it
* | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-014-28/+86
| |
* | Fail static-analysis if there's output to stderrLin Jen-Shin2018-01-261-1/+0
|/ | | | TODO: fix offenders
* Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-251-1/+1
|\ | | | | | | | | Can parse root .gitattributes file for a ref See merge request gitlab-org/gitlab-ce!16418
| * Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-241-1/+1
| |
* | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQLNick Thomas2018-01-241-0/+15
| |
* | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-242-7/+10
| |
* | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-232-7/+28
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307
| * | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-221-3/+28
| | |
| * | Ensure hooks are deleted regardless of the project forking methodAlejandro Rodríguez2018-01-191-4/+0
| | |
* | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-191-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
| * | Initial work to add notification reason to emailsMario de la Ossa2018-01-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* | | Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specsRémy Coutable2018-01-182-0/+239
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-162-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers
* | | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create
* | | Merge branch ↵Stan Hu2018-01-161-6/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2281 (cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7) 2bcbbda0 Filter out sensitive fields from the project services API
* | Use an at_exit hook to stop test gitalystop-gitaly-atexitJacob Vosmaer2018-01-151-5/+3
| |
* | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-118-0/+10
| |
* | Refactor GCP redirect test suiteMatija Čupić2018-01-111-4/+43
|/
* Merge branch 'master' into ↵Matija Čupić2018-01-054-1/+230
|\ | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * Merge branch 'ce-backport=reorder-issues' into 'master'Sean McGivern2018-01-051-1/+14
| |\ | | | | | | | | | | | | CE Backport of reordering issues in epics See merge request gitlab-org/gitlab-ce!16247
| | * Refactor matchers for background migrationsce-backport=reorder-issuesJarka Kadlecová2018-01-051-1/+14
| | |
| * | API: get participants from merge_requests & issuesBrent Greeff2018-01-051-0/+29
| | |
| * | Merge branch 'backport-issue_3413' into 'master'Sean McGivern2018-01-051-0/+180
| |\ \ | | | | | | | | | | | | | | | | [EE-backport] Add group boards API endpoint See merge request gitlab-org/gitlab-ce!16194
| | * | EE-BACKPORT group boardsFelipe Artur2018-01-041-0/+180
| | | |
| * | | Allow local tests to use a modified GitalyJacob Vosmaer (GitLab)2018-01-051-0/+7
| | |/ | |/|
* | | Merge branch 'master' into ↵Matija Čupić2018-01-0512-11/+131
|\ \ \ | |/ / | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | Added multi editor setting on the profile preferences pageJose Ivan Vargas2018-01-041-0/+4
| | |
| * | 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-041-0/+8
| | |
| * | Fix TestEnv.copy_repo to use disk_path instead of full_pathDouglas Barbosa Alexandre2018-01-031-1/+1
| |/
| * Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ↵Rémy Coutable2017-12-237-10/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs" Closes #36782 See merge request gitlab-org/gitlab-ce!16069
| | * Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-227-10/+10
| | |
| * | Merge branch 'sh-disable-dev-shm' into 'master'Rémy Coutable2017-12-231-0/+3
| |\ \ | | | | | | | | | | | | | | | | Disable /dev/shm in CI See merge request gitlab-org/gitlab-ce!16105
| | * | Disable /dev/shm in CIsh-disable-dev-shmStan Hu2017-12-221-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Chrome source code (https://chromium.googlesource.com/chromium/src/base/+/master/base_switches.cc#120): The /dev/shm partition is too small in certain VM environments, causing Chrome to fail or crash (see http://crbug.com/715363). Use this flag to work-around this issue (a temporary directory will always be used to create anonymous shared memory files). Addresses gitlab-org/gitlab-ee#4252 but doesn't appear to cure it completely.
| * | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-221-0/+105
| |/
* | Implement GCP billing check in cluster formMatija Čupić2017-12-211-1/+1
| |
* | Make GCP billing check mock more specificMatija Čupić2017-12-211-1/+1
| |
* | Merge branch 'master' into ↵Matija Čupić2017-12-218-10/+20
|\ \ | |/ | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-192-6/+6
| | | | | | | | | | | | | | | | | | Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
| * Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-153-4/+4
| |\ | | | | | | | | | | | | Replace factory_girl_rails with factory_bot_rails See merge request gitlab-org/gitlab-ce!15919
| | * Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ↵Nick Thomas2017-12-151-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't use Markdown cache for stubbed settings in specs Closes #41130 See merge request gitlab-org/gitlab-ce!15954
| | * | Don't use Markdown cache for stubbed settings in specsignore-markdown-cache-when-stubbing-application-settingsSean McGivern2017-12-151-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ApplicationSetting model uses the CacheMarkdownField concern, which updates the cached HTML when the field is updated in the database. However, in specs, when we want to test conditions using ApplicationSetting, we stub it, because this is accessed in different ways throughout the application. This means that if a spec runs that caches one of the Markdown fields, and a later spec uses `stub_application_setting` to set the raw value of that field, the cached value was still the original one. We can work around this by ignoring the Markdown cache in contexts where we're using `stub_application_setting`. We could be smarter, and only do this on the Markdown fields of the model, but this is probably fine.
| * | Import gitlab_projects.rb from gitlab-shellNick Thomas2017-12-141-0/+2
| |/ | | | | | | | | | | | | | | | | By importing this Ruby code into gitlab-rails (and gitaly-ruby), we avoid 200ms of startup time for each gitlab_projects subprocess we are eliminating. By not having a gitlab_projects subprocess between gitlab-rails / sidekiq and any git subprocesses (e.g. for fork_project, fetch_remote, etc, calls), we can also manage these git processes more cleanly, and avoid sending SIGKILL to them
| * Clear BatchLoader after each spec to prevent holding onto records longer ↵dm-batchloader-projectDouwe Maan2017-12-141-0/+5
| | | | | | | | than necessary
* | Expand controller test suite matrixMatija Čupić2017-12-161-0/+6
|/