summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-082-85/+1
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-071-0/+3
| | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166
* Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-071-1/+21
| | | | | [9.5] Limit `style` attribute on `th` and `td` elements to specific properties See merge request gitlab/gitlabhq!2155
* Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-071-10/+23
| | | | | Fix XSS issue in go-get handling See merge request !2128
* Merge branch ↵Douwe Maan2017-09-072-2/+7
|\ | | | | | | | | | | | | | | | | '30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-false' into 'master' Make Members with Owner and Master roles always able to create subgroups Closes #30473 See merge request !14046
| * Make Members with Owner and Master roles always able to create subgroups30473-allow-creation-of-subgroups-with-gitlab_default_can_create_group-set-to-falseRuben Davila2017-09-072-2/+7
| |
* | Merge branch ↵Douwe Maan2017-09-071-2/+8
|\ \ | |/ |/| | | | | | | | | | | | | '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master' Adds exclusive lease to Git garbage collect worker. Closes #35558 See merge request !14036
| * Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-071-2/+8
| |
* | Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-072-0/+30
|\ \ | | | | | | | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-073-9/+21
| | |
| * | Fix Rubocop failures in API loggerStan Hu2017-09-072-4/+5
| | |
| * | Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-062-0/+17
| |/ | | | | | | Closes #36189
* | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-8/+28
| |
* | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-072-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Implement the implied CI/CD config for AutoDevOps Closes #34777 See merge request !13923
| * \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-077-5/+100
| |\ \ | | | | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * \ \ Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-076-7/+116
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-0628-266/+548
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0642-255/+1104
| |\ \ \ \
| * | | | | Incorporate reviewZeger-Jan van de Weg2017-09-041-1/+1
| | | | | |
| * | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0449-96/+578
| |\ \ \ \ \
| * | | | | | Fix testsZeger-Jan van de Weg2017-09-042-1/+2
| | | | | | |
| * | | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-311-1/+2
| | | | | | |
* | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-076-5/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558
| * | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-076-5/+6
| | | | | | |
* | | | | | | Merge branch ↵Sean McGivern2017-09-072-1/+85
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| * | | | | | | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-071-6/+4
| | | | | | | |
| * | | | | | | Use indigo as default themeAnnabel Dunstone Gray2017-09-071-1/+1
| | | | | | | |
| * | | | | | | Add previews in preferencesAnnabel Dunstone Gray2017-09-061-1/+1
| | | | | | | |
| * | | | | | | Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-1/+3
| | | | | | | |
| * | | | | | | Add blue themeAnnabel Dunstone Gray2017-09-061-1/+2
| | | | | | | |
| * | | | | | | Add functionality for two themesAnnabel Dunstone Gray2017-09-061-6/+2
| | | | | | | |
| * | | | | | | Restore some changes from !9199Rubén Dávila2017-09-062-1/+88
| | | | | | | |
* | | | | | | | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-075-4/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932
| * | | | | | | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-065-4/+14
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
* | | | | | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-071-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Group boards CE backport See merge request !13883
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-09-06117-410/+1997
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ee_issue_928_backport
| * | | | | | | | Fix specs BACKPORTFelipe Artur2017-09-041-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'wiki_api' into 'master'Grzegorz Bizon2017-09-074-0/+106
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API support for wiki pages Closes #12747 See merge request !13372
| * | | | | | | | | Add API support for wiki pagesblackst0ne2017-09-074-0/+106
| | | | | | | | | |
* | | | | | | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-7/+10
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-061-18/+72
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Wiki table of contents are now properly nested to reflect header level See merge request !13909
| * | | | | | | | Refactor table of contents buildingRobert Speicher2017-09-061-19/+11
| | | | | | | | |
| * | | | | | | | Refactor `HeaderNode#find_parent`Robert Speicher2017-09-061-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the instance variable assignment is all contained within `#initialize`, and the `children.push` behavior is more explicit.
| * | | | | | | | Refactor TableOfContentsFilter's nested table of contentsRobert Speicher2017-09-061-42/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the logic is now self-contained within the `HeaderNode` class.
| * | | | | | | | Fix indentation level in Wiki's TOC items to regard header levelAkihiro Nakashima2017-09-061-4/+43
| | | | | | | | |
* | | | | | | | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-064-14/+67
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate creating/deleting a branch to Gitaly See merge request !13864
| * | | | | | | | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-064-14/+67
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch ↵Douwe Maan2017-09-063-1/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
| * | | | | | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-064-8/+16
| | | | | | | | | |
| * | | | | | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
View Lorry Controller Status