summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove instance statistics links from admin pages41416-making-instance-wide-data-tools-more-accessibleBob Van Landuyt2018-07-251-10/+2
|
* Spec instance statisticsBob Van Landuyt2018-07-259-3/+132
|
* gettext:regenerateLuke Bennett2018-07-241-0/+6
|
* Fix lintLuke Bennett2018-07-241-1/+1
|
* correct instance statistics tooltipLuke Bennett2018-07-231-1/+1
|
* Move instance statistics icon left of admin wrenchLuke Bennett2018-07-231-4/+4
|
* Correct active page state for instance statisticsLuke Bennett2018-07-231-1/+1
|
* Add read_instance_statistics global policyLuke Bennett2018-07-234-10/+5
|
* Scope instance_statistics to dashLuke Bennett2018-07-232-2/+3
|
* schema.db updateLuke Bennett2018-07-201-1/+2
|
* add changelog entryLuke Bennett2018-07-191-0/+6
|
* Add instance_statistics_visibility_private application setting and top nav iconLuke Bennett2018-07-186-2/+33
|
* Create instance_statistics namespace and move convdev index and cohorts to itLuke Bennett2018-07-1821-19/+73
|
* Merge branch 'fix-web-ide-header-button-background' into 'master'Filipa Lacerda2018-07-171-0/+1
|\ | | | | | | | | Fix ide-tree-header button background See merge request gitlab-org/gitlab-ce!20662
| * Fix ide-tree-header button backgroundPaul Slaughter2018-07-171-0/+1
| |
* | Merge branch 'extract-ee-specific-banzai-filters' into 'master'Robert Speicher2018-07-173-10/+28
|\ \ | | | | | | | | | | | | Extract EE-specific lines from Banzai pipelines See merge request gitlab-org/gitlab-ce!20636
| * | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filtersSean McGivern2018-07-133-10/+28
| | |
* | | Merge branch 'frozen-string-enable-apps-services-inner' into 'master'Rémy Coutable2018-07-17101-3/+208
|\ \ \ | | | | | | | | | | | | | | | | Enable frozen string in app/services/**/*.rb See merge request gitlab-org/gitlab-ce!20656
| * | | Enable frozen string in apps/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-innergfyoung2018-07-16101-3/+208
| | |/ | |/| | | | | | | | | | | | | For directories application_settings --> labels. Partially addresses #47424.
* | | Merge branch 'update-specific-runners-help-url' into 'master'Clement Ho2018-07-173-11/+14
|\ \ \ | | | | | | | | | | | | | | | | Update specific runners help URL See merge request gitlab-org/gitlab-ce!20213
| * | | Update specific runners help URLGeorge Tsiolis2018-07-173-11/+14
|/ / /
* | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into ↵Douwe Maan2018-07-1716-41/+258
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include full image URL in webhooks for uploaded images Closes #20720 See merge request gitlab-org/gitlab-ce!18109
| * | | Keep #absolute_image_urls as a private instance methodSean McGivern2018-07-172-9/+13
| | | |
| * | | Simplify WikiPage#hook_attrs specSean McGivern2018-07-171-6/+4
| | | |
| * | | Clarify web hook image rewriting doc exampleSean McGivern2018-07-171-2/+2
| | | |
| * | | Don't include a double slash when rewriting the URLSean McGivern2018-07-061-1/+4
| | | |
| * | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_urlSean McGivern2018-07-061929-33482/+64436
| |\ \ \
| * | | | Add documentation and specs for webhook URL rewritingSean McGivern2018-07-067-32/+139
| | | | |
| * | | | Add base class for hook builders, and use it for notes and wikisSean McGivern2018-06-2010-45/+95
| | | | |
| * | | | Fix hook data specsSean McGivern2018-06-204-11/+12
| | | | |
| * | | | Fix MR hook builderSean McGivern2018-06-201-1/+1
| | | | |
| * | | | Removing the empty line at the class body beginningSatish Perala2018-06-201-1/+0
| | | | |
| * | | | Checking for the presense of markdown textSatish Perala2018-06-201-1/+5
| | | | |
| * | | | Passing absolute image urls in the markdown content in the webhooksSatish Perala2018-06-209-2/+53
| | | | |
* | | | | Merge branch '48964-mr-reduce-the-memory-footprint-of-the-component-tree' ↵Fatih Acet2018-07-1718-145/+170
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "MR: Reduce the memory footprint of the component tree" Closes #48964 See merge request gitlab-org/gitlab-ce!20448
| * | | | | Resolve "MR: Reduce the memory footprint of the component tree"Tim Zallmann2018-07-1718-145/+170
|/ / / / /
* | | | | Merge branch 'add-merge-request-header-branch-details-right-margin' into ↵Annabel Gray2018-07-172-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add merge request header branch actions left margin Closes #49238 See merge request gitlab-org/gitlab-ce!20643
| * | | | | Add merge request header branch actions left marginGeorge Tsiolis2018-07-172-0/+6
| | | | | |
* | | | | | Merge branch ↵Annabel Gray2018-07-172-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49165-pipeline-graph-in-new-merge-request-widget-is-flickering' into 'master' Resolve "Pipeline graph in new merge request widget is flickering" Closes #49165 See merge request gitlab-org/gitlab-ce!20660
| * | | | | | Fix MR widget ci status icon tooltip flicker49165-pipeline-graph-in-new-merge-request-widget-is-flickeringClement Ho2018-07-162-1/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'person-tags-better' into 'master'Annabel Gray2018-07-172-7/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlighting of person mentions now better visible on low contrast screens and… See merge request gitlab-org/gitlab-ce!20509
| * | | | | | Highlighting of person mentions now better visible on low contrast screens ↵Dimitrie Hoekstra2018-07-172-7/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | and…
* | | | | | Merge branch 'zj-remove-sanitize-repo-path' into 'master'Sean McGivern2018-07-173-42/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove sanitize_repo_path Closes gitaly#1235 See merge request gitlab-org/gitlab-ce!20666
| * | | | | | Remove sanitize_repo_pathZeger-Jan van de Weg2018-07-173-42/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is unneeded given its been pushed to Gitaly, through https://gitlab.com/gitlab-org/gitaly/merge_requests/780 Closes https://gitlab.com/gitlab-org/gitaly/issues/1235
* | | | | | | Merge branch 'qa-48464-add-edit-delete-file-scenario' into 'master'44127-board-label-edit-drop-down-is-showing-incorrect-selected-labels-summaryRémy Coutable2018-07-178-2/+197
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA scenario to add/edit/delete a file via the Web UI See merge request gitlab-org/gitlab-ce!20265
| * | | | | | | QA scenario to add/edit/delete a file via the Web UISanad Liaquat2018-07-178-2/+197
|/ / / / / / /
* | | | | | | Merge branch 'docs-merge-templates-updates' into 'master'Rémy Coutable2018-07-172-18/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Templates updates See merge request gitlab-org/gitlab-ce!20585
| * | | | | | | Merge Templates updatesMarcel Amirault2018-07-172-18/+18
|/ / / / / / /
* | | | | | | Merge branch 'close-revert-and-cherry-pick-modal-on-escape-keypress' into ↵Rémy Coutable2018-07-175-5/+53
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Close revert and cherry pick modal on escape keypress See merge request gitlab-org/gitlab-ce!20341
| * | | | | | Merge cherry-pick modal specsGeorge Tsiolis2018-07-173-28/+21
| | | | | | |