summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Minor changes to Testing Promises sectionwinh-testing-promises-docspatch-20Winnie Hellmann2017-05-181-6/+7
|
* Merge branch 'remove-services-count-from-usage-ping-data' into 'master'Stan Hu2017-05-182-2/+0
|\ | | | | | | | | | | | | Remove Services count from usage ping payload. Closes gitlab-ee#2241 See merge request !11499
| * Remove Services count from usage ping payload.Ruben Davila2017-05-182-2/+0
| | | | | | | | | | This query was timing out and is blocking the sync of usage data for GitLab.com
* | Merge branch '32425-fix-diff-notes-instant-editing' into 'master'Phil Hughes2017-05-182-3/+44
|\ \ | | | | | | | | | | | | | | | | | | Fix ability to edit diff notes multiple times Closes #32425 See merge request !11456
| * | Fix ability to edit diff notes multiple timesKushal Pandya2017-05-182-3/+44
|/ /
* | Merge branch 'winh-testing-promises' into 'master'Clement Ho2017-05-181-0/+62
|\ \ | |/ |/| | | | | Document Promise testing best practice See merge request !11284
| * Document Promise testing best practice (!11284)winh-testing-promiseswinh2017-05-171-0/+62
| |
* | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-1823-7/+449
|\ \ | | | | | | | | | See merge request !11346.
| * | Fix inaccurate code commentdm-gemfile-viewerDouwe Maan2017-05-181-1/+1
| | |
| * | Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-1723-7/+449
| | |
* | | Merge branch 'fix-trailing-space-mr-widget' into 'master'Fatih Acet2017-05-182-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refactored the anchor tag to remove the trailing space in the target branch Closes #32445 See merge request !11463
| * | | Refactored the anchor tag to remove the trailing space in the target branchfix-trailing-space-mr-widgetJose Ivan Vargas2017-05-172-4/+5
| | | |
* | | | Merge branch 'docs-apiv3-removal-msg' into 'master'Douwe Maan2017-05-181-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make API v3 removal date more clear/match blog post See merge request !11482
| * | | | Reworddocs-apiv3-removal-msgDrew Blessing2017-05-181-3/+3
| | | | |
| * | | | Match v3 caseDrew Blessing2017-05-181-1/+1
| | | | |
| * | | | Make API v3 removal date more clear/match blog postDrew Blessing2017-05-181-1/+3
| | | | |
* | | | | Merge branch 'change-url-in-specific-runners-registration-steps' into 'master'Kamil Trzciński2017-05-184-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove references to '/ci' path while describing Runner's registration See merge request !10518
| * | | | | Remove references to '/ci' path while describing Runner's registrationchange-url-in-specific-runners-registration-stepsTomasz Maczukin2017-05-154-10/+10
| | | | | |
* | | | | | Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-183-5/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix root groups redirecting to group owner Closes #32474 See merge request !11465
| * | | | | | Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843Douwe Maan2017-05-182-5/+3
| | | | | | |
| * | | | | | Fixes #32474Michael Kozono2017-05-172-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
* | | | | | | Merge branch 'fix_removing_invited_member' into 'master'Rémy Coutable2017-05-184-1/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Deleting an invited member causes 500 error Closes #32504 See merge request !11481
| * | | | | | | Fix: Deleting an invited member causes 500 errorValery Sizov2017-05-184-1/+34
| | | | | | | |
* | | | | | | | Merge branch '31562-fix-test_env-set_repo_refs-rspec-profile' into 'master'Robert Speicher2017-05-182-37/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "TestEnv#set_repo_refs fails to update refs sometimes" Closes #31562 See merge request !11253
| * | | | | | | | Shorten the last two commit SHA, because CONSISTENCY31562-fix-test_env-set_repo_refs-rspec-profileRémy Coutable2017-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | If TestEnv#set_repo_refs fails, clean test repos and retryRémy Coutable2017-05-182-26/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes, new references are not retrieved when a `git fetch` is called in a bare repos. The easiest solution is to cleanup the test repos and retry in this case. This only happens when a new ref is added to TestEnv::BRANCH_SHA or TestEnv::FORKED_BRANCH_SHA. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | Factorize TestEvent#copy_repoRémy Coutable2017-05-182-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'fix-update-knapsack-job' into 'master'Robert Speicher2017-05-181-4/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Knapsack report names for RSpec and Spinach See merge request !11477
| * | | | | | | | | Fix Knapsack report names for RSpec and Spinachfix-update-knapsack-jobRémy Coutable2017-05-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'dm-empty-tree-readme' into 'master'Robert Speicher2017-05-181-7/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't blow up when a tree readme is empty and consequently has no rich viewer Closes #32396 See merge request !11459
| * | | | | | | | | | Don't blow up when a tree readme is empty and consequently has no rich viewerdm-empty-tree-readmeDouwe Maan2017-05-171-7/+8
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-1814-32/+196
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's local_branches operation into repo code Closes #27379 See merge request !10059
| * | | | | | | | | | | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-1710-23/+198
| | | | | | | | | | | |
| * | | | | | | | | | | Compare ids of commits if present for equality testAlejandro Rodríguez2017-05-161-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves a problem where commits populated with Gitaly were not equal to commits populated with Rugged. This is because Gitaly may not return all fields of a commit for optimizations purposes, which resulted in false negatives when comparing the same commit (commits with the same sha) with different sources.
| * | | | | | | | | | | Clean import of shared examples for protected branches/tagsAlejandro Rodríguez2017-05-164-2/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'Phil Hughes2017-05-183-8/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking to unresolved/expanded diff note Closes #32424 See merge request !11458
| * | | | | | | | | | | Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-noteEric Eastwood2017-05-173-8/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
* | | | | | | | | | | | Merge branch '32465-center' into 'master'Annabel Dunstone Gray2017-05-181-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recenter profile page nav links Closes #32465 See merge request !11464
| * | | | | | | | | | | recenter profile page nav links32465-centerSimon Knox2017-05-181-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'add-current_user-avatar_url-to-gon' into 'master'Phil Hughes2017-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add current_user_avatar_url to gon See merge request !11474
| * | | | | | | | | | | Add current_user_avatar_url to gonadd-current_user-avatar_url-to-gonLuke "Jared" Bennett2017-05-181-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'backport-ce-upstream-change' into 'master'Rémy Coutable2017-05-181-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate cache invalidation from IssuableBaseService See merge request !11475
| * | | | | | | | | | | | Remove duplicate cache invalidation from IssuableBaseServiceRémy Coutable2017-05-181-1/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'change_migration_style_guide' into 'master'Yorick Peterse2017-05-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Migration guide] Add a note about prefering change_column_null over change_column See merge request !11473
| * | | | | | | | | | | | | [Migration guide] Add note about prefering change_column_null over change_columnchange_migration_style_guideValery Sizov2017-05-181-0/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix_set_null_false_migration' into 'master'Yorick Peterse2017-05-181-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding NULL:false constraint with change_column_null instead of change_column Closes #32450 See merge request !11471
| * | | | | | | | | | | | | Adding NULL:false constraint with change_column_null instead of change_columnfix_set_null_false_migrationValery Sizov2017-05-181-4/+4
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs/refactor-pipeline-schedules' into 'master'Sean Packham (GitLab)2017-05-188-48/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor pipeline schedules docs See merge request !11470
| * | | | | | | | | | | | | Refactor pipeline schedules docsAchilleas Pipinellis2017-05-188-48/+81
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch '32359-align-resolve-btn' into 'master'Filipa Lacerda2017-05-181-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align resolve comment btn Closes #32359 See merge request !11457
View Lorry Controller Status