summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '35804-document-table-based-tests' into 'master'Robert Speicher2017-08-144-0/+72
|\ | | | | | | | | | | | | Use rspec-parameterized for table-based tests Closes #35804 See merge request !13469
| * Use rspec-parameterized for table-based testsNick Thomas2017-08-114-0/+72
| |
* | Merge branch '36385-pipeline-graph-dropdown' into 'master'Phil Hughes2017-08-142-0/+26
|\ \ | | | | | | | | | | | | | | | | | | Stops propagation for dropdown content in pipeline graph. Closes #36385 See merge request !13536
| * | Stops propagation for dropdown content in pipeline graph. Applies the same ↵36385-pipeline-graph-dropdownFilipa Lacerda2017-08-142-0/+26
| | | | | | | | | | | | behavior of the mini graph
* | | Merge branch ↵Clement Ho2017-08-1414-78/+83
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931
| * | | take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdownSimon Knox2017-08-1014-78/+83
| | | |
* | | | Merge branch '7-days-cycle-analytics' into 'master'RĂ©my Coutable2017-08-144-1/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Last 7 days` option for Cycle Analytics view Closes #36300 See merge request !13443
| * | | | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-114-1/+30
| | | | |
| * | | | Add feature specs for Cycle Analytics pipeline summaryMehdi Lahmam2017-08-111-0/+24
| | | | |
* | | | | Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'RĂ©my Coutable2017-08-141-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove `username` from `User#sanitize_attrs` callback See merge request !13511
| * | | | | Remove `username` from `User#sanitize_attrs` callbackrs-remove-username-from-sanitize-attrsRobert Speicher2017-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attribute is since validated against `DynamicPathValidator`, which has strict requirements for the characters allowed, and should no longer need to be sanitized in a callback before saving. This has additional benefits in our test suite, where every creation of a `User` record was calling `Sanitize.clean` on a username value that was always clean, since we're the ones generating it.
* | | | | | Merge branch '36404-do-not-run-flaky-examples-check-for-docs-changes' into ↵Robert Speicher2017-08-141-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't run the `flaky-examples-check` job for docs branches Closes #36404 See merge request !13525
| * | | | | | Don't run the `flaky-examples-check` job for docs branches36404-do-not-run-flaky-examples-check-for-docs-changesRĂ©my Coutable2017-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: RĂ©my Coutable <remy@rymai.me>
* | | | | | | Merge branch 'gitaly-test-bundle-path' into 'master'RĂ©my Coutable2017-08-142-7/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use existing BUNDLE_PATH for gitaly in local tests See merge request !13493
| * | | | | | | Use existing BUNDLE_PATH for gitaly in local testsgitaly-test-bundle-pathJacob Vosmaer2017-08-112-7/+22
| | | | | | | |
* | | | | | | | Merge branch '36236-auto-detect-metrics-for-auto-deployed-environments' into ↵Rémy Coutable2017-08-146-15/+69
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve Prometheus docs, include nginx ingress Closes #36236 See merge request !13438
| * | | | | | | | Improve Prometheus docs, include nginx ingressJoshua Lambert2017-08-146-15/+69
|/ / / / / / / /
* | | | | | | | Merge branch '36089-handle-ref-failure-better' into 'master'Douwe Maan2017-08-1422-162/+223
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor how we fetch ref for merge requests Closes #36089 and #36296 See merge request !13416
| * | | | | | | | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-142-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we could limit the access to Repository#fetch_ref See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37487433
| * | | | | | | | Add comments about why we're stubbing them36089-handle-ref-failure-betterLin Jen-Shin2017-08-141-2/+2
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-14177-1081/+3756
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (47 commits) Update CHANGELOG.md for 9.4.5 Update charlock_holmes add a changelog entry switch to multi-line before block restructure the #new_key notification spec don't send devise notifications to the ghost user reset_delivered_emails before testing #new_key skip the :read_project check for new_project_member move the member spec to be with the other ones add a spec for new_group_member add a spec for never emailing the ghost user rubocop fix a membership with no user is always notifiable check notifiability for more emails add Member#notifiable?(type, opts) make NotificationRecipient a little more customizable Add notes about database performance for MySQL fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance ...
| * | | | | | | | | Skip creating the merge request if repo is emptyLin Jen-Shin2017-08-111-0/+2
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-1163-98/+107
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: Fix merge request diff deserialisation when too_large was absent Bumps omniauth-ldap gem version to 2.0.4 Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb Remove documentation about rules that are now enforced by RuboCop Enable the RSpec/HookArgument cop and auto-correct offenses
| * | | | | | | | | | Just use repository would fix the testLin Jen-Shin2017-08-111-4/+1
| | | | | | | | | | |
| * | | | | | | | | | Since now fetch_ref is reliable, we could just rely on itLin Jen-Shin2017-08-111-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Just use the repo. Not sure why master could passLin Jen-Shin2017-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It keeps giving me no repo error from setting up autocrlf, which shouldn't have anything to do with this merge request.
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-08-11187-802/+1399
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36089-handle-ref-failure-better * upstream/master: (62 commits) Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. Docs: update user docs index Fix minor typos in views Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4' Merge branch 'import-symlinks-9-3' into 'security-9-3' Fix wrong method call on prometheus histogram Document new all-in-one Helm chart - docs Fix 404 on link path Fix line numbers not matching up to code in code viewer. Hide overflow-x on collapsed sidebar removed global use of breakpoint checker Increase performance of the breakpoint size checker Filter sensitive query string parameters from NGINX access logs Added a template for database changes Render new issue link in failed job as a regular link instead of a UJS one Include RE2 in the upgrade docs Remove affix plugin from issuable sidebar with new navigation Fix linter error alternative route for download archive ...
| * | | | | | | | | | | Fix more testsLin Jen-Shin2017-08-117-119/+120
| | | | | | | | | | | |
| * | | | | | | | | | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-106-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a few tests
| * | | | | | | | | | | Try to show exception information in the testLin Jen-Shin2017-08-101-1/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-106-24/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that we don't have to fetch it for non-forks
| * | | | | | | | | | | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Just detect exit status rather than check refLin Jen-Shin2017-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37193731 So we just try a cheaper way to detect it if it works or not
| * | | | | | | | | | | Fix some tests and report the error messageLin Jen-Shin2017-08-098-12/+29
| | | | | | | | | | | |
| * | | | | | | | | | | Fake out Repository#fetch_ref for merge request ifLin Jen-Shin2017-08-092-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the project didn't have a repository setup. We don't try to stub it if the repository was already there.
| * | | | | | | | | | | Detect if we didn't create the ref soonerLin Jen-Shin2017-08-092-1/+25
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'mk-enforce-boolean-defaults' into 'master'Douwe Maan2017-08-149-0/+186
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce boolean defaults on Application Settings Closes #2750 See merge request !13144
| * | | | | | | | | | | | Exclude existing offensesMichael Kozono2017-08-146-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add SaferBooleanColumn copMichael Kozono2017-08-143-0/+180
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-143-23/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate `Git::Repository.ls_files` to Gitaly Closes gitaly#404 See merge request !13302
| * | | | | | | | | | | | | Migrate Git::Repository.ls_files to Gitalygitaly-404-commit-list-filesKim "BKC" Carlbäcker2017-08-103-23/+49
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'zj-patch-rails-template' into 'master'36421-clarify-git_data_dirs-documentationDouwe Maan2017-08-141-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rails tempalte to not contain gitlab-test See merge request !13537
| * | | | | | | | | | | | | Update rails tempalte to not contain gitlab-testZeger-Jan van de Weg2017-08-141-0/+0
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | Merge branch 'pagination-projects-explore' into 'master'Douwe Maan2017-08-148-10/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Prev/Next pagination for exploring projects Closes #27390 See merge request !13456
| * | | | | | | | | | | | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-148-10/+78
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the pagination of the "Explore" pages so they use a simpler pagination system that only shows "Prev" and "Next" buttons. This removes the need for getting the total number of rows to display, a process that can easily take up to 2 seconds when browsing through a large list of projects. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
* | | | | | | | | | | | | Merge branch 'revert-3c2cff0c' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'" See merge request !13533
| * | | | | | | | | | | | | Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'"revert-3c2cff0cMarin Jankovski2017-08-141-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !13523
* | | | | | | | | | | | | Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-143-11/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Thread safe GPGME tmp directory Closes #35986 See merge request !13481
| * | | | | | | | | | | | reset original directory in ensureAlexis Reigel2017-08-141-8/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | add changelogAlexis Reigel2017-08-141-0/+4
| | | | | | | | | | | | |