summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* API: Use POST to (un)block a userapi-post-blockRobert Schilling2017-02-202-2/+34
|
* API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disableRobert Schilling2017-02-201-19/+3
|
* Merge branch 'add-additional-checks-to-ca-data' into 'master' Jacob Schatz2017-02-187-0/+28
|\ | | | | | | | | Small improvements for Cycle Analytics See merge request !9153
| * Restore exposure of legend property for eventsAlfredo Sumaran2017-02-107-0/+28
| |
* | Merge branch 'add-yarn-documentation' into 'master' Clement Ho2017-02-175-24/+62
|\ \ | | | | | | | | | | | | Update documentation to include yarn in our dependencies See merge request !9316
| * \ Merge branch 'master' into add-yarn-documentationMike Greiling2017-02-166-35/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (73 commits) fix typo in node section move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button add space between ci text and commit sha in Merge Request widget Do not use single quote in headings as it breaks docs.gitlab.com Fix broken test Update services templates docs Simplify Pages admin source docs Simplify Pages admin Omnibus docs Fix error in MR widget after /merge slash command Remove arrow icon from folders Create util to handle pagination transformation Wrap long Project and Group titles Changes after review Changes after review Rename storePagination to setPagination Transforms startTimeAgoLoops into a static method so we can reuse it instead of have 2 ...
| * | | use NODE_ENV=production when compiling assets in upgrader scriptMike Greiling2017-02-161-1/+4
| | | |
| * | | do not use --force command argument for yarnMike Greiling2017-02-161-1/+1
| | | |
| * | | add yarn:install to upgrader scriptMike Greiling2017-02-161-1/+1
| | | |
| * | | simplify eslint rake taskMike Greiling2017-02-151-2/+2
| | | |
| * | | ensure rake tasks produce helpful error messages for node dependency issuesMike Greiling2017-02-154-21/+57
| | | |
* | | | Merge branch '26379-iid-param' into 'master'Rémy Coutable2017-02-171-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a :iid param to the IssuableFinder Closes #26379 See merge request !9222
| * | | | add a :iids param to IssuableFindermhasbini2017-02-171-1/+2
| | | | |
* | | | | Merge branch 'paginate-all-the-things' into 'master' Rémy Coutable2017-02-1724-40/+352
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Paginate all the things Closes #8099 See merge request !8606
| * | | | Backport API to v3paginate-all-the-thingsRobert Schilling2017-02-179-1/+262
| | | | |
| * | | | Paginate all endpoints that return an arrayRobert Schilling2017-02-1616-40/+91
| | | | |
* | | | | Merge branch '26500-informative-slack-notifications' into 'master' Kamil Trzciński2017-02-171-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding links to user & build stage in a Build message Closes #26500 See merge request !8641
| * | | | | Adding links to user & build in Chat NotificationsPoornima M2017-01-251-0/+10
| | | | | |
* | | | | | Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-171-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer service object over after_save hook Closes #26921 See merge request !8664
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-1561-364/+1167
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (488 commits) Remove duplicate CHANGELOG.md entries for 8.16.5 Update CHANGELOG.md for 8.14.9 Update CHANGELOG.md for 8.15.6 #27631: Add missing top-area div to activity header page Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Fix yarn lock and package.json mismatch caused by MR 9133 sync yarn.lock with recent changes to package.json Add changelog Fix z index bugs Add Links to Branches in Calendar Activity SidekiqStatus need to be qualified in some cases Replace static fixture for behaviors/requires_input_spec.js (!9162) API: Consolidate /projects endpoint Add MySQL info in install requirements Fix timezone on issue boards due date Use Gitlab::Database.with_connection_pool from !9192 Disconnect the pool after done Use threads directly, introduce pool later: ...
| * | | | | | | Use UpdateRunnerService to update runner in API:Lin Jen-Shin2017-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: Add tests to make sure controllers and API would tick the queue.
* | | | | | | | Merge branch '22018-api-milestone-merge-requests' into 'master' Rémy Coutable2017-02-171-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint to get all milestone merge requests Closes #22018 See merge request !9298
| * | | | | | | | Add API endpoint to get all milestone merge requestsJoren De Groof2017-02-171-0/+22
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '28329-allow-slash-in-slash-command-args' into 'master'Sean McGivern2017-02-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow slashes in slash command arguments Closes #28329 See merge request !9327
| * | | | | | | | Allow slashes in slash command argumentsRémy Coutable2017-02-171-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'only-yield-valid-reference-matches' into 'master'Sean McGivern2017-02-171-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only yield valid references in ReferenceFilter.references_in Closes #27648 See merge request !9318
| * | | | | | | | Only yield valid references in ReferenceFilter.references_inonly-yield-valid-reference-matchesDouwe Maan2017-02-161-1/+6
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-172-88/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199
| * | | | | | | | Remove all instances of theme_id; require downtimeAnnabel Dunstone Gray2017-02-151-1/+1
| | | | | | | | |
| * | | | | | | | Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-151-87/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'zj-fix-url-new-issue-presenter' into 'master' Kamil Trzciński2017-02-171-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix project link on issue creation See merge request !9226
| * | | | | | | Fix project link on issue creationzj-fix-url-new-issue-presenterZ.J. van de Weg2017-02-141-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'fix-8.17-upgrade-process' into 'master' Alfredo Sumaran2017-02-161-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 8.17 upgrade documentation Closes #28021 See merge request !9285
| * | | | | | | | move "Install node modules" step before "Migrate DB" within update processMike Greiling2017-02-161-1/+1
| | | | | | | | |
| * | | | | | | | update migration docs for 8.17 to include minimum node versionMike Greiling2017-02-161-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-163-32/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import webhooks performance issue Closes #27958 See merge request !9197
| * | | | | | | Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-163-32/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update repo restorer to use project wiki method.
* | | | | | | | Merge branch 'snippets-search-performance' into 'master' Yorick Peterse2017-02-161-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce query count for snippet search See merge request !9254
| * | | | | | | | Reduce query count for snippet searchsnippets-search-performancePhil Hughes2017-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recudes the number of queries within the snippet search from approx. 50 to approx. 14 by preloading the authors Part of #27392
* | | | | | | | | Merge branch ↵Rémy Coutable2017-02-161-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects' into 'master' Ensure only commit comments relevant to target project are returned Closes #27873 See merge request !9264
| * | | | | | | | | Ensure only commit comments relevant to target project are returnedMark Fletcher2017-02-151-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'add-auto-submited-header' into 'master'Sean McGivern2017-02-161-0/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `Auto-Submitted: auto-generated` header to emails Closes #20305 See merge request !9163
| * | | | | | | | | Set `Auto-Submitted: auto-generated` header to emailsSemyon Pupkov2017-02-151-0/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
* | | | | | | | | Merge branch 'move_tags_service_to_namespace' into 'master'Rémy Coutable2017-02-151-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move tag services to `Tags` namespace See merge request !9231
| * | | | | | | | | Move tag services to `Tags` namespacedixpac2017-02-141-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CreateTagService and DeleteTagService where in root namespace, by following service code organization I moved them in Tags::CreateService and Tags::DestroyService
* | | | | | | | | Merge branch 'add-missing-api-entities' into 'master'Rémy Coutable2017-02-151-17/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing api entities Closes #23895 See merge request !7138
| * | | | | | | | | entities: use the RepoCommit entity for branch commitsBen Boeckel2017-02-141-17/+18
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23895.
* | | | | | | | | Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
* | | | | | | | | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* | | | | | | | | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-151-0/+3
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057