summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Make diff_refs_match_commit validation reusablePatrick Bajao2019-08-014-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to DiffPositionableNote concern which will be re-used in EE in DraftNote model.
| * | | | | | | | Add commit_id to draft_notes tablePatrick Bajao2019-08-013-1/+13
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520
* | | | | | | | Merge branch 'add-cop-for-rspec-file-paths' into 'master'Ash McKenzie2019-08-0219-66/+150
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RSpec/TopLevelDescribePath cop See merge request gitlab-org/gitlab-ce!31241
| * | | | | | | | Quarantine folder containing only a folder specadd-cop-for-rspec-file-pathsSean McGivern2019-08-011-1/+2
| | | | | | | | |
| * | | | | | | | Remove snippet breadcrumb specSean McGivern2019-08-011-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We removed the breadcrumbs in 0def36777e3f9e5f57fd0e1ebd023b43229622fc.
| * | | | | | | | Fix project nav specsSean McGivern2019-08-011-2/+2
| | | | | | | | |
| * | | | | | | | Remove mail_google_schema_whitelisting specSean McGivern2019-08-011-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This task was removed in 2014! The spec wasn't, probably because it didn't fail as it was never executed. See 0fc5c80207a1ebcfbdae1d0d16b9aeb984bac271.
| * | | | | | | | Fix milestone view specsSean McGivern2019-08-013-2/+3
| | | | | | | | |
| * | | | | | | | Fix labels issuable link specsSean McGivern2019-08-013-15/+40
| | | | | | | | |
| * | | | | | | | Rename broken spec filesSean McGivern2019-08-0115-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RSpec only executes files ending in _spec.rb.
| * | | | | | | | Add RSpec/TopLevelDescribePath copSean McGivern2019-08-013-0/+103
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RSpec/FilePath cop checks that a spec file's path is correct, but only if the file describes a constant. We want to check, for any file with a top-level `describe`, whether the file path ends in `_spec.rb`. We don't care what comes before that; just that it will be executed by RSpec at all.
* | | | | | | | Merge branch '9928-add-security-approvals-docs' into 'master'Evan Read2019-08-022-0/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for Security Approvals for MRs See merge request gitlab-org/gitlab-ce!30959
| * | | | | | | | Add documentation for Security Approvals for MRsLucas Charles2019-08-022-0/+42
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Documents how to enable security approvals
* | | | | | | | Merge branch 'ce-update-echarts' into 'master'Paul Slaughter2019-08-012-9/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | (CE Port) Remove local echarts dependency See merge request gitlab-org/gitlab-ce!31282
| * | | | | | | Remove local echarts dependencyMartin Wortschack2019-08-012-9/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | - Update package.json and yarn.lock
* | | | | | | Merge branch 'revert-editor-indents' into 'master'Michael Kozono2019-08-0116-1287/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'mh/editor-indents' into 'master'" See merge request gitlab-org/gitlab-ce!31391
| * | | | | | | Revert "Merge branch 'mh/editor-indents' into 'master'"revert-editor-indentsPaul Slaughter2019-08-0116-1287/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28f2225bdfee4d353f07a766c6c8b29ba6181397, reversing changes made to 96ae5bd83da31350e9856a290127d7aa1469710a.
* | | | | | | | Merge branch 'ce-docker_image_replication' into 'master'Douglas Barbosa Alexandre2019-08-019-3/+57
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809 See merge request gitlab-org/gitlab-ce!31375
| * | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809ce-docker_image_replicationValery Sizov2019-08-019-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introducing Docker Registry replication
* | | | | | | | Merge branch 'id-user-auto-complete-can-merge' into 'master'Robert Speicher2019-08-014-1/+62
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add can_merge option to autocomplete response See merge request gitlab-org/gitlab-ce!30565
| * | | | | | | | Add can_merge option to autocomplete responseIgor2019-08-014-1/+62
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | It's used only if merge_request_iid param is provided
* | | | | | | | Merge branch 'bvl-fix-relative-positioning-rename-ce' into 'master'Robert Speicher2019-08-011-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip specs for default relative positions See merge request gitlab-org/gitlab-ce!31390
| * | | | | | | | Skip specs for default relative positionsBob Van Landuyt2019-08-011-1/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a model has a default relative position we don't need to test that it is moved to the end, it will instead get the default value assigned.
* | | | | | | | Merge branch '63707-tiller-is-installed-on-a-specific-node-pool-docs' into ↵Rémy Coutable2019-08-011-9/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Document the current state of the Review App clusters Closes #63707 See merge request gitlab-org/gitlab-ce!31385
| * | | | | | | | Document the current state of the Review App clustersRémy Coutable2019-08-011-9/+22
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'Stan Hu2019-08-0115-78/+316
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use NotesFinder to fetch notes on API and Controllers Closes #52123 See merge request gitlab-org/gitlab-ce!31300
| * | | | | | | Change block parameter name to params52123-issuable-actions-notesfinder-pderichsPatrick Derichs2019-08-012-3/+3
| | | | | | | |
| * | | | | | | Use NotesFinder in IssuableActions modulePatrick Derichs2019-08-0115-78/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove project from NotesFinder constructor Add project parameter to specs Also look for methods in private scope Fix specs to match new NotesFinder constructor
* | | | | | | | Merge branch 'mc-reduce-namespaces-lease-time' into 'master'Douglas Barbosa Alexandre2019-08-012-45/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardcodes namespaces lease timing value to 1.5h See merge request gitlab-org/gitlab-ce!31341
| * | | | | | | | Hardcodes namespaces lease timing value to 1.5hMayra Cabrera2019-08-012-45/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After measuring the response and performance of the workers on https://gitlab.com/gitlab-org/gitlab-ce/issues/64092, we've decided 1.5 is fine for now. The time can be decreased later in the future when enforcing the quota limits Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/64092
* | | | | | | | Merge branch 'osw-avoid-errors-due-to-concurrent-calls' into 'master'Douwe Maan2019-08-017-27/+128
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add exclusive lease to mergeability check process See merge request gitlab-org/gitlab-ce!31082
| * | | | | | | | Add exclusive lease to mergeability check processosw-avoid-errors-due-to-concurrent-callsOswaldo Ferreira2019-07-317-27/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent calls to UserMergeToRef RPC updating a single ref can lead to an opaque fail that is being rescued at Gitaly. So this commit adds an exclusive lease to the mergeability check process with the key as the current MR ID.
* | | | | | | | | Merge branch 'jupyter-fixes-v1' into 'master'Mike Greiling2019-08-013-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jupyter fix hostname editing and remove extra load balancer Closes #59740 and #62686 See merge request gitlab-org/gitlab-ce!31332
| * | | | | | | | | Jupyter fix hostname editing and remove extra load balancerAmit Rathi2019-08-013-0/+10
|/ / / / / / / / /
* | | | | | | | | Merge branch 'implement-dag' into 'master'Sean McGivern2019-08-0124-74/+567
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initial support for DAG Closes #47063 See merge request gitlab-org/gitlab-ce!31328
| * | | | | | | | | Add support for DAGKamil Trzciński2019-08-0124-74/+567
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the support for `needs:` keyword as part of GitLab CI. That makes some of the jobs to be run out of order.
* | | | | | | | | Merge branch '65321-review-stop-fails-when-the-branch-is-deleted-upon-merge' ↵Lin Jen-Shin2019-08-011-3/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure `review-stop` can run even when the branch has been deleted Closes #65321 See merge request gitlab-org/gitlab-ce!31277
| * | | | | | | | | Ensure review-stop can run even when the branch has been deleted65321-review-stop-fails-when-the-branch-is-deleted-upon-mergeRémy Coutable2019-08-011-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'rename-relative-position-move-to-end' into 'master'Bob Van Landuyt2019-08-013-10/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug when moving batches of items to the end See merge request gitlab-org/gitlab-ce!31351
| * | | | | | | | | Fix bug when moving batches of items to the endrename-relative-position-move-to-endHeinrich Lee Yu2019-08-013-10/+13
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starts from START_POSITION when there are no existing positions. Also improves the test to actually test the behavior
* | | | | | | | | Merge branch 'qa-ml-fix-file-size-test' into 'master'Walmyr2019-08-011-6/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix push file size test Closes gitlab-org/quality/nightly#113 See merge request gitlab-org/gitlab-ce!31321
| * | | | | | | | Fix push file size testqa-ml-fix-file-size-testMark Lapierre2019-07-311-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And remove it from quarantine
* | | | | | | | | Merge branch 'ticket_126158_vlad' into 'master'Tom Atkins2019-08-011-2/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Portray better use of types of variables in .gitlab-ci.yml See merge request gitlab-org/gitlab-ce!31232
| * | | | | | | | Portray better use of types of variables in .gitlab-ci.ymlVlad Stoianovici2019-08-011-2/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-ml-add-package-and-qa-always' into 'master'Rémy Coutable2019-08-011-4/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new `package-and-qa-always` job See merge request gitlab-org/gitlab-ce!31270
| * | | | | | | | Implement review suggestionsMark Lapierre2019-08-011-4/+16
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make package-and-qa manual so the default `on_success` doesn't need to be set on package-and-qa-always. Remove unnecessary `except: []`
* | | | | | | | Merge branch 'double-slash-64592' into 'master'Kamil Trzciński2019-08-014-11/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Double Slash in Review Apps Path Closes #64592 See merge request gitlab-org/gitlab-ce!31212
| * | | | | | | | Use Array.join rather than URI.joinJason Goodman2019-08-014-11/+35
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Add spec for cases where URI.join does not work as expected
* | | | | | | | Merge branch '62178-remove-manual-sorting-feature-flag' into 'master'Sean McGivern2019-08-014-10/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the manual sorting feature flag See merge request gitlab-org/gitlab-ce!30131
| * | | | | | | | Remove manual_sorting flag from FE62178-remove-manual-sorting-feature-flagRajat Jain2019-07-311-1/+1
| | | | | | | | |