summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-181-3/+13
|\
| * Fixes #32474Michael Kozono2017-05-171-3/+13
* | Merge branch 'fix_removing_invited_member' into 'master'Rémy Coutable2017-05-183-0/+33
|\ \
| * | Fix: Deleting an invited member causes 500 errorValery Sizov2017-05-183-0/+33
* | | Merge branch '31562-fix-test_env-set_repo_refs-rspec-profile' into 'master'Robert Speicher2017-05-182-37/+36
|\ \ \
| * | | Shorten the last two commit SHA, because CONSISTENCY31562-fix-test_env-set_repo_refs-rspec-profileRémy Coutable2017-05-181-2/+2
| * | | If TestEnv#set_repo_refs fails, clean test repos and retryRémy Coutable2017-05-182-26/+34
| * | | Factorize TestEvent#copy_repoRémy Coutable2017-05-182-13/+4
| |/ /
* | | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-188-4/+108
|\ \ \
| * | | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-174-2/+111
| * | | Clean import of shared examples for protected branches/tagsAlejandro Rodríguez2017-05-164-2/+0
* | | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'Phil Hughes2017-05-181-0/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-noteEric Eastwood2017-05-171-0/+28
* | | | Merge branch 'sh-fix-container-registry-s3-redirects' into 'master'Kamil Trzciński2017-05-182-1/+40
|\ \ \ \
| * | | | Properly handle container registry redirects to fix metadata stored on a S3 b...sh-fix-container-registry-s3-redirectsStan Hu2017-05-172-1/+40
* | | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into 'mas...Phil Hughes2017-05-182-41/+120
|\ \ \ \ \
| * | | | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-caseEric Eastwood2017-05-182-41/+120
| | |/ / / | |/| | |
* | | | | Merge branch '31987-automatically-close-assignee-select-dropdown-after-select...Phil Hughes2017-05-183-21/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix form specClement Ho2017-05-162-22/+8
| * | | | Fix rubocopClement Ho2017-05-161-3/+3
| * | | | Merge branch 'master' into '31987-automatically-close-assignee-select-dropdow...Clement Ho2017-05-16197-1102/+2968
| |\ \ \ \
| * | | | | Remove unnecessary commentClement Ho2017-05-121-1/+1
| * | | | | Add additional EE checkClement Ho2017-05-111-4/+0
| * | | | | Add helper to disable css animation in rspecClement Ho2017-05-113-37/+26
| * | | | | Fix sidebar specClement Ho2017-05-091-1/+0
| * | | | | Fix issue specClement Ho2017-05-091-4/+0
| * | | | | Add specClement Ho2017-05-092-0/+26
* | | | | | Merge branch 'dm-tree-last-commit' into 'master'Dmitriy Zaporozhets2017-05-172-3/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add spec for last commit info when browsing repository filesdm-tree-last-commitDmitriy Zaporozhets2017-05-171-0/+12
| * | | | | Show last commit for current tree on tree pageDouwe Maan2017-05-171-3/+3
* | | | | | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-171-0/+27
|/ / / / /
* | | | | Merge branch 'dm-consistent-commit-widget' into 'master' Dmitriy Zaporozhets2017-05-171-22/+0
|\ \ \ \ \
| * | | | | Use same last commit widget on project homepage and tree viewdm-consistent-commit-widgetDouwe Maan2017-05-171-22/+0
* | | | | | Fix unassigned checkmarkClement Ho2017-05-171-0/+11
* | | | | | Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-05-171-0/+28
|\ \ \ \ \ \
| * | | | | | Invalidate cache for issue and MR counters more granularlycounters_cache_invalidationValery Sizov2017-05-151-0/+28
* | | | | | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' Filipa Lacerda2017-05-173-2/+32
|\ \ \ \ \ \ \
| * | | | | | | Address MR comments.acet-mr-widget-nothing-to-commit-stateFatih Acet2017-05-161-1/+1
| * | | | | | | MRWidget: Fix specs and address WIP comments.Fatih Acet2017-05-161-2/+14
| * | | | | | | Add new_blob_path to MR json schemaOswaldo Ferreira2017-05-161-0/+1
| * | | | | | | Returns new_blob_path only when user can push_code to projectOswaldo Ferreira2017-05-161-0/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' in...Tim Zallmann2017-05-172-44/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Use classes to select dropdown buttons.32172-improve-responsive-styling-of-pipeline-schedules-formBryce Johnson2017-05-151-2/+2
| * | | | | | Clean up UI and styles.Bryce Johnson2017-05-152-42/+5
* | | | | | | Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-162-18/+98
|\ \ \ \ \ \ \
| * | | | | | | Add an ability to cancel attaching file and redesign attaching files UIblackst0ne2017-05-162-18/+98
* | | | | | | | Wait for all Vue resources to finish in merge immediately specsh-disable-merge-worker-in-specStan Hu2017-05-161-1/+1
* | | | | | | | Disable Sidekiq in spec to prevent transient build failuresStan Hu2017-05-161-3/+5
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-164-47/+51
|\ \ \ \ \ \ \
| * | | | | | | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to m...dm-blob-viewer-concernsDouwe Maan2017-05-153-24/+24