summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '22578-cycle-analytics-incorrect-commit-count'Douwe Maan2016-09-271-11/+15
|\
| * Fix the "Commits" section of the cycle analytics summary.Timothy Andrew2016-09-261-11/+15
* | Fix snippets pagination22500-can-t-paginate-through-snippetsRémy Coutable2016-09-261-0/+18
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-213-0/+234
|\
| * Implement a second round of review comments from @DouweM.Timothy Andrew2016-09-211-4/+0
| * Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-207-49/+91
| |\
| * | Fix all cycle analytics specs.Timothy Andrew2016-09-202-7/+21
| * | Test the `CycleAnalytics::Summary` model.Timothy Andrew2016-09-201-3/+23
| * | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-072-38/+72
| |\ \
| * | | Fix rubocop spec.Timothy Andrew2016-09-071-2/+2
| * | | Consolidate all cycle analytics helper methods.Timothy Andrew2016-09-072-141/+184
| * | | Add a test case for "end condition happens before start condition".Timothy Andrew2016-09-071-0/+21
| * | | Test the `production` cycle analytics phase.Timothy Andrew2016-09-071-1/+5
| * | | Test the `staging` cycle analytics phase.Timothy Andrew2016-09-071-4/+4
| * | | Generate branch/file names more randomly to avoid failures.Timothy Andrew2016-09-071-0/+9
| * | | Test the `code` cycle analytics phase.Timothy Andrew2016-09-071-0/+31
| * | | Refactor cycle analytics specs.Timothy Andrew2016-09-021-0/+96
* | | | Merge branch 'feature/import-export-security-specs' into 'master' Douwe Maan2016-09-202-0/+162
|\ \ \ \ | |_|_|/ |/| | |
| * | | attempt to fix random error in remote buildJames Lopez2016-09-091-0/+2
| * | | refactored some stuff and added new models / attributes after rebaseJames Lopez2016-09-092-8/+2
| * | | more spec refactoring based on feedbackJames Lopez2016-09-091-0/+6
| * | | fixing a couple of bugs and lots of refactoring of the export file specJames Lopez2016-09-092-17/+61
| * | | add model configuration spec to check for new models. Also refactored attribu...James Lopez2016-09-091-0/+15
| * | | fixed spacingJames Lopez2016-09-091-1/+1
| * | | remove IGNORED_ATTRIBUTES no longer requiredJames Lopez2016-09-091-2/+0
| * | | more refactoring of the specsJames Lopez2016-09-091-7/+29
| * | | refactored specs based on feedbackJames Lopez2016-09-091-0/+81
* | | | Fixed testsissue-boards-keyboard-shortcutPhil Hughes2016-09-151-0/+7
* | | | Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-091-0/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Request only the LDAP attributes we needDrew Blessing2016-09-091-0/+47
* | | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-091-0/+5
|\ \ \ \
| * | | | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-051-0/+5
| | |_|/ | |/| |
* | | | Move write_note into SlashCommandsHelper and update other dependent specsslash-commands-issuable-spec-fixStan Hu2016-09-082-9/+11
* | | | Wait for logout message in login_helpersStan Hu2016-09-081-0/+1
* | | | Use wait_for_ajax to avoid database deadlocks after specs are cleanedStan Hu2016-09-081-0/+7
* | | | Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rbStan Hu2016-09-081-48/+21
| |/ / |/| |
* | | Make sure DatabaseCleaner.clean runs AFTER Capybara's cleanupAirat Shigapov2016-09-041-1/+1
|/ /
* | Merge branch 'shorten-task-status-phrase' into 'master' Douwe Maan2016-08-301-18/+45
|\ \
| * | Shorten task status phraseClement Ho2016-08-291-18/+45
| |/
* | Fix resolving conflicts on forks21459-resolving-merge-conflicts-from-a-forked-repo-through-uiSean McGivern2016-08-301-20/+27
|/
* Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-1/+2
* Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-182-0/+372
|\
| * Remove unneeded aliasesDouwe Maan2016-08-181-2/+2
| * Fix specs and implement fixes based on failing specsDouwe Maan2016-08-171-2/+2
| * Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-161-0/+4
| |\
| * | Force notes poll after commands have been executedDouwe Maan2016-08-121-11/+11
| * | Add support for no-op slash commands that appear in autocompleteRémy Coutable2016-08-131-3/+2
| * | Add the /title slash commandRémy Coutable2016-08-131-0/+37
| * | New Notes::SlashCommandsService serviceRémy Coutable2016-08-132-118/+2
| * | Enforce permissions in `{Issues,MergeRequests}::{Close,Reopen}Service`Rémy Coutable2016-08-131-15/+98