summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Rename gl_project_name -> gl_project_pathsh-log-project-name-with-gitalyStan Hu2019-02-052-5/+5
| | | | Upgrade gitaly-proto to 1.10.0 to have this field.
* Add more tests and comments around Wiki formattingStan Hu2019-02-052-1/+36
|
* Add convenience methods for creating project and Wiki repositoriesStan Hu2019-02-051-1/+1
| | | | This makes it easier to access other project arguments in the future.
* Refactor use of Shell.import_repository for WikisStan Hu2019-02-052-9/+13
| | | | | | The previous behavior would pass in a list of parameters to Shell, but we can improve this by using the WikiFormatter and Project models to give us the same information.
* Clean up Shell.fork_repositoryStan Hu2019-02-052-16/+4
| | | | Use project models instead of a list of parameters.
* Send project name with Gitaly repository requestsStan Hu2019-02-0525-50/+60
| | | | | | | When hashed storage is in use, it's helpful to have the project name associated with the request. Closes https://gitlab.com/gitlab-org/gitaly/issues/1394
* Merge branch 'winh-note_app_spec-vue-test-utils' into 'master'sh-bump-supported-ruby-versionsFatih Acet2019-02-061-81/+86
|\ | | | | | | | | Convert note_app_spec.js to Vue test utils See merge request gitlab-org/gitlab-ce!24900
| * Convert note_app_spec.js to Vue test utilsWinnie Hellmann2019-02-041-81/+86
| |
* | Resolve "Update project topics styling to use badges design"Brandon Labuschagne2019-02-051-2/+9
| |
* | Merge branch ↵Stan Hu2019-02-051-0/+114
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'rd-update-last_activity_on-on-logins-and-browsing-activity-54947' into 'master' Update User's last_activity_on for any GET request on projects Closes #54947 See merge request gitlab-org/gitlab-ce!24642
| * | Update last_activity_on for Users on some main GET endpointsRubén Dávila2019-02-051-0/+114
| | | | | | | | | | | | | | | | | | | | | In order to have an accurate date about the last activity of a User we need to update the last_activity_on field when the User is visiting some basic pages of GitLab like pages related to Dashboards, Projects, Issues and Merge Requests
* | | Merge branch 'use-deployment-relation-to-fetch-environment-ce' into 'master'Stan Hu2019-02-051-0/+20
|\ \ \ | | | | | | | | | | | | | | | | Backport: Optimize slow pipelines.js response See merge request gitlab-org/gitlab-ce!24890
| * | | Backport: Optimize slow pipelines.js responseShinya Maeda2019-02-051-0/+20
| |/ / | | | | | | | | | Add changelog
* | | Merge branch 'adriel-use-svg-icon-for-deployment-series' into 'master'Phil Hughes2019-02-051-0/+67
|\ \ \ | | | | | | | | | | | | | | | | Use SVG icon for deployment series See merge request gitlab-org/gitlab-ce!24652
| * | | Use svg icon for deployment seriesAdriel Santiago2019-02-051-0/+67
| | | | | | | | | | | | | | | | Use the rocket GitLab SVG to show deployment data
* | | | Merge branch 'jej/avoid-csrf-check-on-saml-failure' into 'master'Rémy Coutable2019-02-051-0/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip CSRF check on SAML failure endpoint Closes #56574 See merge request gitlab-org/gitlab-ce!24509
| * | | | Avoid CSRF check on SAML failure endpointJames Edwards-Jones2019-02-041-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SAML and OAuth failures should cause a message to be presented, as well as logging that an attempt was made. These were incorrectly prevented by the CSRF check on POST endpoints such as SAML. In addition we were using a NullSession forgery protection, which made testing more difficult and could have allowed account linking to take place if a CSRF was ever needed but not present.
* | | | | Merge branch 'diff-file-finder' into 'master'Filipa Lacerda2019-02-055-161/+140
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added fuzzy file finder to merge requests Closes #53304 See merge request gitlab-org/gitlab-ce!24434
| * | | | | Added fuzzy file finder to merge requestsPhil Hughes2019-02-055-161/+140
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* | | | | | Merge branch 'bvl-codeowner-rules-model-ce' into 'master'Sean McGivern2019-02-051-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds helper for `find_or_create_by` in transaction See merge request gitlab-org/gitlab-ce!24913
| * | | | | | Adds helper for `find_or_create_by` in transactionBob Van Landuyt2019-02-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to call `find_or_create_by` on all models and scopes.
* | | | | | | Merge branch 'sh-encode-content-disposition' into 'master'Sean McGivern2019-02-059-14/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode Content-Disposition filenames Closes #47673 See merge request gitlab-org/gitlab-ce!24919
| * | | | | | | Encode Content-Disposition filenamesStan Hu2019-02-049-14/+51
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users downloading non-ASCII attachments would see garbled characters. When used with object storage, AWS S3 would return an InvalidArgument error: Header value cannot be represented using ISO-8859-1. Per RFC 5987 and RFC 6266, Content-Disposition should be encoded properly. This commit takes the Rails 6 implementation of ActiveSuppport::Http::ContentDisposition (https://github.com/rails/rails/pull/33829) and ports it here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47673
* | | | | | | Merge branch 'jprovazn-remove-redcarpet' into 'master'Grzegorz Bizon2019-02-0515-458/+105
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Redcarpet markdown engine Closes #51374 See merge request gitlab-org/gitlab-ce!24819
| * | | | | | Remove Redcarpet markdown engineJan Provaznik2019-02-0415-458/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This engine was replaced with CommonMarker in 11.4, it was deprecated since then.
* | | | | | | Merge branch 'not-run-pipeline-on-empty-merge-request' into 'master'Grzegorz Bizon2019-02-052-2/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create new pipeline for merge requests with no commits See merge request gitlab-org/gitlab-ce!24503
| * | | | | | | Fix false-positive specHiroyuki Sato2019-02-051-18/+18
| | | | | | | |
| * | | | | | | Move validation logic to service layerHiroyuki Sato2019-01-285-23/+25
| | | | | | | |
| * | | | | | | Don't create merge request pipeline without commitsHiroyuki Sato2019-01-204-6/+26
| | | | | | | |
* | | | | | | | Fix comparing equality between `ActionController::Parameters` and a `Hash`....Daniel Juarez2019-02-051-0/+10
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Make `ActionContorller::Parameters` serializable for sidekiq jobsPeter Leitzen2019-02-051-5/+44
| | | | | | |
* | | | | | | Merge branch 'fe-grammar-util' into 'master'Phil Hughes2019-02-051-0/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FE grammar util See merge request gitlab-org/gitlab-ce!24893
| * | | | | | | Add grammar utilPaul Slaughter2019-02-041-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contains the function `toNounSeriesText` which can be used to build i18n noun series fragments (i.e. "A, B, and C").
* | | | | | | | Merge branch 'search-title' into 'master'Sean McGivern2019-02-054-0/+104
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'in' filter that modifies scope of 'search' filter to issues and merge requests API See merge request gitlab-org/gitlab-ce!24350
| * | | | | | | | Fix grammar and spellingHiroyuki Sato2019-02-051-6/+6
| | | | | | | | |
| * | | | | | | | Add 'in' filter that modifies scope of 'search' filter to issues and merge ↵Hiroyuki Sato2019-01-144-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requests API
* | | | | | | | | Extract ReplyPlaceholder from NoteableDiscussion componentWinnie Hellmann2019-02-052-17/+48
| | | | | | | | |
* | | | | | | | | Merge branch 'update-pages-config-only-when-changed' into 'master'Grzegorz Bizon2019-02-051-7/+25
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pages config only when changed See merge request gitlab-org/gitlab-ce!24424
| * | | | | | | | | Do not reload daemon if configuration file of pages does not changeKamil Trzciński2019-01-161-7/+25
| | | | | | | | | |
* | | | | | | | | | Merge branch '57227-absolute-uri-missing-hierarchical-segment' into 'master'Sean McGivern2019-02-051-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActionView::Template::Error: Absolute URI missing hierarchical segment Closes #57227 See merge request gitlab-org/gitlab-ce!24908
| * | | | | | | | | Catch possible Addressable::URI::InvalidURIErrorBrett Walker2019-02-041-0/+7
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ssh-host-key-indifferent' into 'master'Stan Hu2019-02-041-0/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow SshHostKey.find_by to accept string keys See merge request gitlab-org/gitlab-ce!24903
| * | | | | | | | | Allow SshHostKey.find_by to accept string keysNick Thomas2019-02-041-0/+23
| | | | | | | | | |
* | | | | | | | | | Merge branch 'adriel-handle-echarts-resize-events' into 'master'Phil Hughes2019-02-042-6/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle metrics graph resize events See merge request gitlab-org/gitlab-ce!24649
| * | | | | | | | | | Handle window and container resize eventsAdriel Santiago2019-02-042-6/+21
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resizes metrics graph on window and sidebard width changes
* | | | | | | | | | Merge branch 'fe-api-group-members' into 'master'Phil Hughes2019-02-041-0/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add groupMembers to api.js See merge request gitlab-org/gitlab-ce!24892
| * | | | | | | | | | Add groupMembers to api.jsPaul Slaughter2019-02-031-0/+16
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fj-regression-external-wiki-url' into 'master'Rémy Coutable2019-02-041-8/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed external wiki query method to prevent attribute caching Closes #57228 See merge request gitlab-org/gitlab-ce!24907
| * | | | | | | | | | Changed external wiki query method to prevent attribute cachingFrancisco Javier López2019-02-041-8/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch ↵Rémy Coutable2019-02-041-15/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backup-restore' into 'master' Resolve "Add timestamps for each stage of gitlab-rake gitlab:backup:restore" Closes #46448 See merge request gitlab-org/gitlab-ce!19684
View Lorry Controller Status