summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* modify tests to see more than one element since we render the label itself now24685_view_selfRegis2017-08-071-12/+17
* Merge branch 'master' into 24685_view_selfRegis2017-08-04762-2237/+4149
|\
| * Merge branch '34060-simplified-general-project-settings' into 'master'Mike Greiling2017-08-043-12/+41
| |\
| | * fixed up specsPhil Hughes2017-07-281-6/+14
| | * trying to fix teststauriedavis2017-07-281-1/+12
| | * try and fix some teststauriedavis2017-07-282-5/+15
| * | Merge branch 'tc-fix-mr-query-params' into 'master'Rémy Coutable2017-08-041-0/+20
| |\ \
| | * | Add spec to test combining API merge_requests query parametersToon Claes2017-08-031-0/+20
| * | | Merge branch '2902-standalone-ee-dir-ce' into 'master'Rémy Coutable2017-08-041-8/+10
| |\ \ \
| | * | | Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-041-8/+10
| * | | | Merge branch 'revert-6291bc8c' into 'master'Rémy Coutable2017-08-041-1/+0
| |\ \ \ \
| | * | | | Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"revert-6291bc8cRobert Speicher2017-08-031-1/+0
| * | | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'Robert Speicher2017-08-041-10/+30
| |\ \ \ \ \
| | * | | | | Migrate Repository#last_commit_for_path to GitalyAhmad Sherif2017-08-031-10/+30
| * | | | | | Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-041-46/+56
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-031-46/+56
| | |/ / / /
| * | | | | Merge branch 'rs-issue-35701' into 'master'Rémy Coutable2017-08-041-0/+2
| |\ \ \ \ \
| | * | | | | Ensure DeviseHelpers is loaded before inclusion in LoginHelpersrs-issue-35701Robert Speicher2017-08-031-0/+2
| * | | | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-042-34/+5
| |\ \ \ \ \ \
| | * | | | | | rm a now-useless spechttp://jneen.net/2017-08-031-34/+0
| | * | | | | | add builder helpers with levels and start to separate out #filter!http://jneen.net/2017-08-031-0/+5
| * | | | | | | Merge branch 'fix-jira-integration' into 'master'Rémy Coutable2017-08-041-0/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling itMehdi Lahmam2017-08-031-0/+9
| * | | | | | | | Remove monkey-patched Array.prototype.first() and last() methodsMike Greiling2017-08-047-30/+3
| * | | | | | | | Merge branch 'diff-changed-files-dropdown' into 'master'Filipa Lacerda2017-08-041-0/+52
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixed jumping when bar gets stuckPhil Hughes2017-08-031-0/+52
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Resolve "Specific Async Script Loading by using a Page Variable"Tim Zallmann2017-08-031-0/+13
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'tc-no-todo-service-select-mysql' into 'master'Sean McGivern2017-08-031-5/+28
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-031-5/+28
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | fix #3686 make tarball download url to end with extensionhaseeb2017-08-032-4/+8
| * | | | | | | Merge branch 'use-rspec-support-helper' into 'master'Rémy Coutable2017-08-0314-51/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helperLin Jen-Shin2017-08-0314-51/+15
| | |/ / / / / /
| * | | | | | | fix #35133 strip new lines from ssh keyshaseeb2017-08-031-6/+8
| | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'fix-oauth-checkboxes' into 'master'Filipa Lacerda2017-08-031-0/+8
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxesPhil Hughes2017-08-031-0/+8
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-031-17/+27
| |\ \ \ \ \
| | * | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-021-17/+27
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-032-0/+247
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-032-0/+247
| * | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-034-23/+34
| |\ \ \ \ \
| | * | | | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-034-23/+34
| * | | | | | Merge branch 'fix-gitaly-install' into 'master'Rémy Coutable2017-08-032-11/+16
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Don't call load_tasks as this would load the tasks twicefix-gitaly-installRémy Coutable2017-08-022-8/+8
| | * | | | | Ensure we run installation Rake tasks in a clean env in TestEnvRémy Coutable2017-08-021-5/+10
| | | |_|/ / | | |/| | |
| * | | | | Remove test gitaly when older than version fileJacob Vosmaer (GitLab)2017-08-031-0/+11
| * | | | | Merge branch 'sidebar-fly-out-sub-nav' into 'master'Filipa Lacerda2017-08-031-0/+180
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into sidebar-fly-out-sub-navsidebar-fly-out-sub-navPhil Hughes2017-08-021072-3149/+8380
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | stop mobile from showing the sub-itemsPhil Hughes2017-08-021-1/+44
| | * | | | | Math.floor the value in the testsPhil Hughes2017-08-011-1/+1
| | * | | | | fixed translate3d testPhil Hughes2017-08-011-5/+5