summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Improved readability of issues related MR status spec57428-actionview-template-error-undefined-method-for-nil-nilclassConstance Okoghenun2019-02-081-1/+2
|
* Added tests for merge_request_status partialJan Provaznik2019-02-081-0/+21
|
* Upgrade cluster applications, starting with runnerThong Kuah2019-02-0719-247/+549
|
* Merge branch 'jlenny-AddPagesTemplates' into 'master'Douglas Barbosa Alexandre2019-02-071-1/+6
|\ | | | | | | | | | | | | Pages templates on the new project templates menu Closes #47857 See merge request gitlab-org/gitlab-ce!24906
| * Add Pages templatesJason Lenny2019-02-071-1/+6
| | | | | | | | | | | | | | Adds templates for the 5 most popular Pages templates to the new project menu. This does not add unique icons for the templates because that turned out more complicated than expected, and this feature is valuable without them.
* | Merge branch ↵Douglas Barbosa Alexandre2019-02-071-0/+4
|\ \ | | | | | | | | | | | | | | | | | | '9255-implement-access-controls-when-sso-enforcement-enabled-ce' into 'master' Port migration fix from EE 9270 See merge request gitlab-org/gitlab-ce!25004
| * | Fix migration failure9255-implement-access-controls-when-sso-enforcement-enabled-ceJames Lopez2019-02-071-0/+4
| | |
* | | Merge branch '19745-new-tasklists-for-merge-requests' into 'master'Sean McGivern2019-02-076-89/+132
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable fast task lists for merge requests Closes #19745 See merge request gitlab-org/gitlab-ce!24779
| * | | Add fast tasklist support to MR tasklistFatih Acet2019-02-072-19/+44
| | | | | | | | | | | | | | | | Also adds specs and fixes existing specs
| * | | Enable fast task lists for merge requestsBrett Walker2019-02-074-70/+88
| | | | | | | | | | | | | | | | Allow single tasks to be updated quickly
* | | | Merge branch 'master' into ↵Sean McGivern2019-02-078-62/+378
|\ \ \ \ | | | | | | | | | | | | | | | fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
| * | | | Resolve "Override squash commit message"Natalia Tepluhina2019-02-077-58/+367
| | |_|/ | |/| |
| * | | Merge branch 'sh-fix-ee-issue-8871' into 'master'Sean McGivern2019-02-071-4/+11
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Fix failing test in spec/workers/post_receive_spec.rb Closes gitlab-ee#8871 See merge request gitlab-org/gitlab-ce!24993
| | * | Fix failing test in spec/workers/post_receive_spec.rbsh-fix-ee-issue-8871Stan Hu2019-02-061-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what was happening before: 1. `Project#set_timestamps_for_create` was called at creation time and set the `last_activity_at` and `last_repository_updated_at` to the current timestamp T. 2. The test ran `PostReceive#perform`, which then called `PostReceive#process_wiki_changes`. If less than 500 milliseconds elapsed since T, then the update would just set the timestamp to T. To fix this problem, we can just use Timecop to ensure at least one second has elapsed after attempting to process changes. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/8871
* | | | Merge branch 'master' into ↵Sean McGivern2019-02-0760-266/+1273
|\ \ \ \ | |/ / / | | | | | | | | fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
| * | | Merge branch '52363-ui-changes-to-cluster-and-ado-pages' into 'master'Grzegorz Bizon2019-02-078-112/+315
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves domain setting to Clusters page Closes #52363 See merge request gitlab-org/gitlab-ce!24580
| | * | | Addresses UX and BE comments:52363-ui-changes-to-cluster-and-ado-pagesMayra Cabrera2019-02-064-102/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changes help text on clusters form to make it more explicit. - Removes unnecessary warnings on auto devops form - Simplifies cluster methods logic
| | * | | Addresses backend/db review commentsMayra Cabrera2019-02-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes multiple typos on AutoDevops script - Add an alias to Clusters::Cluster#domain as base_domain, so it's more descriptive - Removes unnecessary memoization on qa specs - Changes migration to a post migration to deal better with traffic on big instances (like gitlab.com)
| | * | | Use a single sql statement for ADO queryMayra Cabrera2019-02-041-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since cluster_projects table does not have a lot of records, currently it has 11,638, it seems better to use a single sql statement to update all the records
| | * | | Moves domain setting to Cluster settingMayra Cabrera2019-02-046-27/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes domain field to be on the Cluster page show, removing it from Auto DevOps setting. Also injects the new environment variable KUBE_INGRESS_BASE_DOMAIN into kubernetes#predefined_variables. Migration to move the information from ProjectAutoDevops#domain to Clusters::Cluster#domain. As well as necessary modifications to qa selectors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
| * | | | Merge branch 'ce-version-fix-failing-resolve-conflicts-spec' into 'master'Sean McGivern2019-02-071-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update spec/features/merge_request/user_resolves_conflicts_spec.rb See merge request gitlab-org/gitlab-ce!24996
| | * | | | Update spec/features/merge_request/user_resolves_conflicts_spec.rbPhil Hughes2019-02-071-0/+2
| | | | | |
| * | | | | Merge branch 'local-markdown-version' into 'master'Douglas Barbosa Alexandre2019-02-077-35/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add local markdown version Closes #32789 See merge request gitlab-org/gitlab-ce!24822
| | * | | | | Add local markdown versionlocal-markdown-versionJan Provaznik2019-02-067-35/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cached markdown version is composed both from global and local markdown version. This allows admins to bump version locally when needed (e.g. when external URL is changed).
| * | | | | | Merge branch '56014-api-merge-request-squash-commit-messages' into 'master'Nick Thomas2019-02-071-0/+23
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API support for setting squash commit message during squash Closes #56014 See merge request gitlab-org/gitlab-ce!24784
| | * | | | | | API support for squash commit message during merge56014-api-merge-request-squash-commit-messagesLuke Duncalfe2019-02-071-0/+23
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues https://gitlab.com/gitlab-org/gitlab-ce/issues/47149 https://gitlab.com/gitlab-org/gitlab-ce/issues/56014
| * | | | | | Merge branch 'fix-repo-settings-file-upload-error' into 'master'Nick Thomas2019-02-071-8/+36
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing repository mirror settings UI to break Closes #55134 See merge request gitlab-org/gitlab-ce!23712
| | * | | | | Fix bug causing repo mirror settings UI to breakfix-repo-settings-file-upload-errorLuke Bennett2019-01-081-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an exception relating to the new project cleanup settings in 11.6 that causes the mirror repo settings UI to become unusable.
| * | | | | | Merge branch 'api-group-labels' into 'master'Sean McGivern2019-02-072-0/+276
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API group labels Closes #44901 See merge request gitlab-org/gitlab-ce!21368
| | * | | | | | Incorporate feedback from RobertRobert Schilling2019-01-311-107/+34
| | | | | | | |
| | * | | | | | Don't run subgroup tests for mysqlRobert Schilling2019-01-311-2/+2
| | | | | | | |
| | * | | | | | Incorporate feedback from NickRobert Schilling2019-01-312-4/+33
| | | | | | | |
| | * | | | | | Use a schema matcher to capture all entity membersRobert Schilling2019-01-312-0/+18
| | | | | | | |
| | * | | | | | Add changelog, version information, frozen string literalsRobert Schilling2019-01-311-0/+2
| | | | | | | |
| | * | | | | | Add subscription API for the group label APIRobert Schilling2019-01-311-1/+89
| | | | | | | |
| | * | | | | | Add specsRobert Schilling2019-01-311-0/+212
| | | | | | | |
| * | | | | | | Merge branch 'ee-8346-hide-unlicensed-alerts' into 'master'Fatih Acet2019-02-071-9/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport to resolve conflicts for gitlab-ee!9224 See merge request gitlab-org/gitlab-ce!24889
| | * | | | | | | Use ee_else_ce alias for monitoring_bundleee-8346-hide-unlicensed-alertsSimon Knox2019-02-071-9/+7
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch ↵Phil Hughes2019-02-075-15/+63
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-view' into 'master' Resolve "Lines changed statistics is not easily visible in MR changes view" Closes #52347 See merge request gitlab-org/gitlab-ce!24569
| | * | | | | | | Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-065-15/+63
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put the statistics in the compare-versions header for the entire MR Put them in the file header for each individual file
| * | | | | | | Remove ECharts metrics dashboard feature flagAdriel Santiago2019-02-074-0/+288
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Modifying gitaly search files client to add chunking supportJohn Cai2019-02-061-13/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates gitaly proto to 1.7.0, modifies the search files gitaly client call to use the new chunked_response flag in the rpc request, and stitch the responses together. maintains backwards compatibility with older gitaly servers.
| * | | | | | Merge branch 'bjk/56788_unicorn_labels' into 'master'Stan Hu2019-02-061-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up unicorn sampler metric labels Closes #56788 See merge request gitlab-org/gitlab-ce!24626
| | * | | | | Clean up unicorn sampler metric labelsBen Kochie2019-02-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change `type` and `address` labels to be less generic to avoid conflicts with other systems.
| * | | | | | Merge branch 'sh-log-project-name-with-gitaly' into 'master'Rémy Coutable2019-02-0627-69/+106
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send project name with Gitaly repository requests Closes gitaly#1394 See merge request gitlab-org/gitlab-ce!23373
| | * | | | | | 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.