summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-fix-mysql-failure' into 'master' Sean McGivern2017-05-111-1/+1
|\
| * Fix MySQL build failuredm-fix-mysql-failureDouwe Maan2017-05-101-1/+1
* | Fix slash commands detection in commentsKushal Pandya2017-05-111-6/+19
* | Merge branch '32045-vue-warn-cannot-find-element-issuable-time-tracker' into ...Phil Hughes2017-05-111-42/+0
|\ \
| * | Remove sidebar bundle spec32045-vue-warn-cannot-find-element-issuable-time-trackerClement Ho2017-05-101-42/+0
* | | Merge branch 'dm-auxiliary-viewers' into 'master' Sean McGivern2017-05-119-66/+337
|\ \ \
| * | | Reset Repository#license memo when license file is changedDouwe Maan2017-05-101-1/+2
| * | | Implement auxiliary blob viewersDouwe Maan2017-05-109-65/+335
| | |/ | |/|
* | | Merge branch 'fix-shortcuts_spec-explore-page-transient-failure' into 'master' Douwe Maan2017-05-111-14/+17
|\ \ \ | |/ / |/| |
| * | Fix `send_key` to `send_keys` and add EOF newlinefix-shortcuts_spec-explore-page-transient-failureLuke "Jared" Bennett2017-05-101-3/+3
| * | Find the nothing-here-block before asserting page content when on explore pag...Luke "Jared" Bennett2017-05-101-15/+18
* | | Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-109-27/+73
|\ \ \
| * | | Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-079-27/+73
* | | | Track pending requests in AjaxCacheWinnie Hellmann2017-05-101-14/+43
* | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-1062-97/+97
|\ \ \ \
| * | | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-1018-24/+24
| * | | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-1047-73/+73
* | | | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-1017-153/+608
|\ \ \ \ \
| * | | | | Use `described_class` in SnippetsFinder-specBob Van Landuyt2017-05-101-21/+21
| * | | | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-102-11/+81
| * | | | | Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-101-0/+22
| * | | | | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-108-95/+320
| * | | | | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-101-3/+72
| * | | | | Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-102-3/+26
| * | | | | Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-101-0/+12
| * | | | | Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-102-38/+64
| * | | | | Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-102-4/+12
| | |_|/ / | |/| | |
* | | | | Merge branch '31474-issue-boards-sidebar-milestone-dropdown-should-not-be-mul...Phil Hughes2017-05-101-0/+59
|\ \ \ \ \
| * | | | | Disallow multiselect for Milestone dropdownSam Rose2017-05-101-0/+59
* | | | | | Merge branch 'tc-clean-pending-delete-projects' into 'master' Douwe Maan2017-05-102-0/+111
|\ \ \ \ \ \
| * | | | | | No user needed to cleanup namespaceless pending delete projectsToon Claes2017-05-102-11/+17
| * | | | | | Use worker to destroy namespaceless projects in post-deployToon Claes2017-05-103-72/+105
| * | | | | | Add post-deploy migrate to cleanup projects in pending delete stateToon Claes2017-05-101-0/+72
* | | | | | | Merge branch 'dm-async-tree-readme' into 'master' Douwe Maan2017-05-102-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Load tree readme asynchronouslydm-async-tree-readmeDouwe Maan2017-05-102-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Replace old isObject for underscore methodsFilipa Lacerda2017-05-106-6/+0
* | | | | | Tech debt: Creates vue component for loading iconFilipa Lacerda2017-05-101-0/+53
* | | | | | Resolve "Update gem sidekiq-cron from 0.4.4 to 0.6.0 and rufus-scheduler from...Dosuken shinya2017-05-101-0/+18
* | | | | | Merge branch 'fix-sidebar_spec-assignee-edit-transient-failure' into 'master' Sean McGivern2017-05-101-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Find dropdown-menu before asserting active item in sidebar_spec.rbfix-sidebar_spec-assignee-edit-transient-failureLuke "Jared" Bennett2017-05-101-2/+2
* | | | | | Merge branch 'search-restrict-projects-to-group' into 'master' Filipa Lacerda2017-05-101-0/+19
|\ \ \ \ \ \
| * | | | | | Filter projects by group on search pagesearch-restrict-projects-to-groupPhil Hughes2017-05-081-0/+19
* | | | | | | Merge branch 'fix-search-not-highlighting' into 'master' Filipa Lacerda2017-05-101-9/+37
|\ \ \ \ \ \ \
| * | | | | | | Fixed search terms not highlightPhil Hughes2017-05-101-9/+37
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issue-boards-sidebar-create-new-label-404-error' into 'master' Filipa Lacerda2017-05-101-0/+45
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fixed create label form not working on issue boards in a sub-group projectissue-boards-sidebar-create-new-label-404-errorPhil Hughes2017-05-081-0/+45
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'use_relative_path_for_project_avatars' into 'master' Douwe Maan2017-05-108-21/+52
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use relative paths for group/project/user avatarsblackst0ne2017-05-108-21/+52
| | |/ / / | |/| | |
* | | | | Fix broken test - load correct data32074-failed-buildFilipa Lacerda2017-05-102-102/+233
* | | | | Use vue file for table pagination componentFilipa Lacerda2017-05-101-1/+1