summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-114-11/+25
|\ | | | | | | | | | | | | Expire Wiki content cache after importing a repository Closes #47546 See merge request gitlab-org/gitlab-ce!19617
| * Fix Rubocop failure in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
| |
| * Work around limitations of expect_any_instance_of by stubbing Project.findStan Hu2018-06-113-9/+23
| |
| * Expire Wiki content cache after importing a repositoryStan Hu2018-06-112-2/+2
| | | | | | | | | | | | | | The cache state for Wikis that were imported via GitHub or Bitbucket does not appear to have been flushed after a successful import. Closes #47546
* | Merge branch 'jprovazn-rails5-boards' into 'master'Rémy Coutable2018-06-111-6/+12
|\ \ | | | | | | | | | | | | | | | | | | [Rails5] Fix conversion of integer into string in board spec Closes #47653 See merge request gitlab-org/gitlab-ce!19616
| * | Fix conversion of integer into string in board specJan Provaznik2018-06-091-6/+12
| |/ | | | | | | | | | | In rails 5 controller specs, integers are converted to strings unless conte-type is set with `as: :json`: https://github.com/rails/rails/issues/26069
* | Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'Sean McGivern2018-06-114-4/+4
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Uploads specs are failing on master" Closes #47684 See merge request gitlab-org/gitlab-ce!19638
| * | Don't use Rails.root.join for upload fixture pathsRémy Coutable2018-06-114-4/+4
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'ide-etag-polling' into 'master'Filipa Lacerda2018-06-112-22/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix IDE pipelines eTagPoll not stopping Closes #47678 See merge request gitlab-org/gitlab-ce!19636
| * | | fixed specsPhil Hughes2018-06-111-18/+29
| | | |
| * | | Fix IDE pipelines eTagPoll not stoppingPhil Hughes2018-06-111-4/+7
| | | | | | | | | | | | | | | | Closes #47678
* | | | Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into ↵Filipa Lacerda2018-06-112-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use Tooltip component in MrWidgetAuthorTime vue component See merge request gitlab-org/gitlab-ce!19635
| * | | | Update MrWidgetAuthorTime and MRWidgetMerged specGeorge Tsiolis2018-06-112-2/+2
| | | | |
| * | | | Rename MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-111-3/+3
| | | | |
* | | | | Avoid checking the user format in every url validationFrancisco Javier López2018-06-114-21/+96
| |_|/ / |/| | |
* | | | Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-119-25/+41
| | | |
* | | | Merge branch 'rs-update-rspec' into 'master'Rémy Coutable2018-06-1143-76/+72
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449
| * | | Correct more usages of non-relative `fixture_file_upload` pathsRobert Speicher2018-06-078-19/+13
| | | |
| * | | Make all uses of `fixture_file_upload` use relative pathsRobert Speicher2018-06-0737-58/+60
| | | |
* | | | Merge branch 'dz-jupyter-use-nip-io' into 'master'Grzegorz Bizon | off until 20th June2018-06-111-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Use nip.io instead of xip.io for jupyter domain suggestion See merge request gitlab-org/gitlab-ce!19576
| * | | Use nip.io instead of xip.io for jupyter domain suggestionDmitriy Zaporozhets2018-06-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'bvl-terms-on-registration' into 'master'Robert Speicher2018-06-084-69/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can accept terms during registration Closes gitlab-ee#6262 and #47621 See merge request gitlab-org/gitlab-ce!19583
| * | | | Users can accept terms during registrationBob Van Landuyt2018-06-084-69/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user checks the `accept` checkbox, we will track that acceptance as usual. That way they don't need to accept again after they complete the registration. When an unauthenticated user visits the `/-/users/terms` page, there is no button to accept, decline or continue. The 'current-user menu' is also hidden from the top bar.
* | | | | Merge branch 'rs-schema-spec-parity' into 'master'Nick Thomas2018-06-081-1/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Refactor schema_spec.rb for CE-EE parity and simplicity See merge request gitlab-org/gitlab-ce!19563
| * | | | Refactor schema_spec.rb for CE-EE parity and simplicityRobert Speicher2018-06-071-1/+5
| | | | |
* | | | | Revert rename allow collaboration columnMark Chao2018-06-081-1/+1
| | | | |
* | | | | Resolve "Automatically created MR uses wrong target branch (when branching ↵Athar Hameed2018-06-081-3/+8
| | | | | | | | | | | | | | | | | | | | from Tag)"
* | | | | Fix NotificationRecipientService spec for EESean McGivern2018-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE checks a license, which needs RequestStore enabled to avoid N+1 queries. However, enabling RequestStore causes Gitaly to complain about N+1 invocations, which we really don't care about here.
* | | | | Merge branch 'improve-housekeeping-spec' into 'master'Nick Thomas2018-06-081-31/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport changes for Housekeeping Specs See merge request gitlab-org/gitlab-ce!18595
| * | | | | backport changes from gitlab-org/gitlab-ee!5461improve-housekeeping-specGabriel Mazetto2018-04-261-31/+41
| | | | | |
* | | | | | Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into ↵2018-06-07-code-freeze-ee2018-06-07-code-freezeTim Zallmann2018-06-087-82/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Upgrade Monaco editor and remove CopyWebpackPlugin" Closes #44331 See merge request gitlab-org/gitlab-ce!17813
| * | | | | | refactor monaco-editor import and stop storing as class property within editorMike Greiling2018-06-081-4/+5
| | | | | | |
| * | | | | | remove need to pass monaco around through DIMike Greiling2018-06-074-10/+7
| | | | | | |
| * | | | | | remove monacoLoader and import monaco directly within Editor classMike Greiling2018-06-077-76/+31
| | | | | | |
* | | | | | | Set tooltips to have default boundary viewportClement Ho2018-06-081-0/+4
|/ / / / / /
* | | | | | Backport of "Add assignee lists to boards"Mario de la Ossa2018-06-0711-8/+35
| | | | | |
* | | | | | Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master'Clement Ho2018-06-072-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the default strings of timeago.js for timeago Closes #47182 See merge request gitlab-org/gitlab-ce!19350
| * | | | | Use the default strings of timeago.js for timeagoTakuya Noguchi2018-06-042-2/+2
| | | | | |
* | | | | | Merge branch 'issue_44230' into 'master'Sean McGivern2018-06-073-29/+227
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply notification settings level of groups to all child objects Closes #44230 See merge request gitlab-org/gitlab-ce!19191
| * | | | | | Apply notification settings level of groups to all child objectsFelipe Artur2018-06-073-29/+227
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzciński2018-06-0744-212/+850
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | 38542-application-control-panel-in-settings-page
| * | | | | | Resolve "Automatically provide a Deploy Token to projects when Auto DevOps ↵Mayra Cabrera2018-06-072-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | is enabled"
| * | | | | | Resolve "Show `failure_reason` and improve failed jobs tab in pipeline ↵André Luís2018-06-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | detail view"
| * | | | | | Merge branch 'introduce-job-keep-alive-api-endpoint' into 'master'Tomasz Maczukin2018-06-071-0/+30
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CI job update entrypoint to work as keep-alive endpoint See merge request gitlab-org/gitlab-ce!19543
| | * | | | | | Change update entrypoint instead of adding new keep-alive oneTomasz Maczukin2018-06-071-58/+26
| | | | | | | |
| | * | | | | | Introduce new keep-alive API entrypoint for CI jobTomasz Maczukin2018-06-071-0/+62
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'ce-4936-roadmap-navigation-presets' into 'master'Phil Hughes2018-06-071-12/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport: Add timeframe helper methods See merge request gitlab-org/gitlab-ce!19553
| | * | | | | | Add timeframe helper methodsKushal Pandya2018-06-071-12/+11
| | | | | | | |
| * | | | | | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-0723-97/+287
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| | * | | | | | | find assets in test for CI and local testAlexis Reigel2018-06-063-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14583/diffs we can't use the same method to access assets in a CI and the local test environment anymore.
View Lorry Controller Status