summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-migration-helper-race-conditions' into 'master' Rémy Coutable2016-06-131-0/+13
|\
| * Handle NULL migration errors in migration helpersYorick Peterse2016-06-131-0/+13
* | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-131-0/+1
|\ \
| * | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-131-0/+1
* | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-132-13/+289
|\ \ \ | |_|/ |/| |
| * | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-3/+4
| * | Remove notification level from user modelFelipe Artur2016-06-102-11/+286
* | | Improved SVG sanitizer specs to include smoke tests for clean.bug/svg_sanitizerGabriel Mazetto2016-06-121-0/+16
* | | Refactored SVG sanitizerGabriel Mazetto2016-06-121-0/+18
* | | Refactor SVG sanitizer and prevent `xlink:href` to refer to external resourcesGabriel Mazetto2016-06-121-3/+15
* | | Fix SVG whitelisting to allow namespaced attributesGabriel Mazetto2016-06-121-0/+48
* | | Merge branch 'fix-closes-issues-error-500' into 'master' Robert Speicher2016-06-121-0/+15
|\ \ \
| * | | Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-111-0/+15
* | | | Merge branch '18417-nav-offscreen' into 'master' Dmitriy Zaporozhets2016-06-111-3/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-101-3/+5
* | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-0/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-101-0/+33
* | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-104-4/+7
|\ \ \ \
| * \ \ \ Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-1032-341/+865
| |\ \ \ \
| * \ \ \ \ Add send_git_diff helperDouwe Maan2016-06-0862-811/+2631
| |\ \ \ \ \
| * | | | | | Add workhorse controller and API helpersDouwe Maan2016-06-063-3/+6
* | | | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-101-16/+7
|\ \ \ \ \ \ \
| * | | | | | | Updated testsci-page-ui-updatePhil Hughes2016-06-101-1/+1
| * | | | | | | Fixed failing testsPhil Hughes2016-06-101-2/+4
| * | | | | | | CI build page UI updatePhil Hughes2016-06-101-19/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'user-search-dropdown' into 'master' Jacob Schatz2016-06-101-36/+0
|\ \ \ \ \ \ \
| * | | | | | | removed tests needed for any author :poop:user-search-dropdownPhil Hughes2016-06-101-36/+0
| |/ / / / / /
* | | | | | | Merge branch 'label-filter-fix' into 'master' Jacob Schatz2016-06-101-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Added testslabel-filter-fixPhil Hughes2016-06-091-0/+15
* | | | | | | | Merge branch 'rename-ci-commit-phase-4' into 'master' Rémy Coutable2016-06-102-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4Kamil Trzcinski2016-06-106-17/+171
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Rename commit to pipeline in TriggerRequestKamil Trzcinski2016-06-092-2/+2
* | | | | | | | Fixing specs stubbed objects cannot access databasePaco Guzman2016-06-103-4/+4
* | | | | | | | Cache the presence of an issue_tracker at project levelPaco Guzman2016-06-102-0/+96
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Rename ci_commit -> pipelineRémy Coutable2016-06-102-18/+18
* | | | | | | Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergea...Rémy Coutable2016-06-102-33/+38
* | | | | | | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-103-64/+96
* | | | | | | Allow or not merge MR with failed buildRui Anderson2016-06-103-0/+230
| |/ / / / / |/| | | | |
* | | | | | Fix failing `EmailOnPush` spec.Timothy Andrew2016-06-101-2/+2
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-091-7/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-091-2/+28
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-091-1/+82
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0918-99/+146
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-091-7/+6
* | | | | | | Merge branch 'due-date-field-ux-improv' into 'master' Jacob Schatz2016-06-091-5/+7
|\ \ \ \ \ \ \
| * | | | | | | Fixed testsPhil Hughes2016-06-091-5/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'issue_17607' into 'master' Jacob Schatz2016-06-091-0/+46
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Change date format to be non zero padded in order to fix failing testAlfredo Sumaran2016-06-091-1/+1
| * | | | | | Add tests for dates on tooltipsAlfredo Sumaran2016-06-091-0/+46
| | |_|/ / / | |/| | | |
* | | | | | Toggling a task in a description with mentions doesn't creates a TodoDouglas Barbosa Alexandre2016-06-091-2/+28
|/ / / / /