summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-132-6/+6
|\ | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-121-2/+2
| |
| * move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-121-4/+4
| |
* | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-122-1/+3
|\ \ | |/ |/| | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190
| * Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-112-1/+3
| | | | | | This reverts merge request !14148
* | Eager load namespace owners for project dashboardsdashboards-projects-controllerYorick Peterse2017-09-111-1/+1
|/ | | | | This solves an N+1 query problem where we'd run multiple queries when getting the namespace owners of the displayed projects.
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-082-3/+1
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Merge branch 'backport-issues-controller-changes' into 'master'Sean McGivern2017-09-082-14/+17
|\ | | | | | | | | Move issues index variable setting to a method See merge request !14048
| * Merge branch 'master' into backport-issues-controller-changesbackport-issues-controller-changesBryce Johnson2017-09-0711-17/+28
| |\
| * | Move issues index variable setting to a methodSean McGivern2017-09-072-14/+17
| | | | | | | | | | | | This makes it easier to reuse in EE.
* | | 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-071-12/+10
| |/ |/|
* | Merge branch 'zj-auto-devops-table' into 'master'Kamil Trzciński2017-09-072-7/+10
|\ \ | | | | | | | | | | | | | | | | | | Implement the implied CI/CD config for AutoDevOps Closes #34777 See merge request !13923
| * \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-0710-210/+244
| |\ \ | | | | | | | | | | | | 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-071-2/+1
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-0615-20/+54
| |\ \ \ \ | | | | | | | | | | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * \ \ \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-065-24/+61
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-045-29/+63
| |\ \ \ \ \ \
| * | | | | | | Form for setting project auto devops settingsZeger-Jan van de Weg2017-08-312-7/+10
| | | | | | | |
* | | | | | | | Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-078-9/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558
| * | | | | | | Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-078-9/+15
| | | | | | | |
* | | | | | | | Merge branch ↵Sean McGivern2017-09-072-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| * | | | | | | Restore some changes from !9199Rubén Dávila2017-09-062-1/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-078-209/+241
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Group boards CE backport See merge request !13883
| * | | | | | Finish backports and fix specsFelipe Artur2017-09-061-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-09-0613-66/+175
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | ee_issue_928_backport
| * | | | | | Fix specs BACKPORTFelipe Artur2017-09-041-1/+1
| | | | | | |
| * | | | | | Small fixesFelipe Artur2017-08-311-1/+1
| | | | | | |
| * | | | | | Continue BE backportFelipe Artur2017-08-314-1/+45
| | | | | | |
| * | | | | | Group boards CE backportFelipe Artur2017-08-287-209/+197
| | | | | | |
* | | | | | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-061-2/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch ↵Douwe Maan2017-09-066-3/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-067-10/+23
| | | | | | |
| * | | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-061-0/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-067-9/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902
| * | | | | | rework the contributor badgemicael.bergeron2017-09-061-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - only show in merge-requests - show as a little glyph
| * | | | | | round of fixes after code reviewmicael.bergeron2017-09-061-2/+5
| | | | | | |
| * | | | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-067-9/+16
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes
* | | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-5/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027
| * \ \ \ \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵Grzegorz Bizon2017-09-063-6/+32
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
| * | | | | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-051-5/+7
| | | | | | |
* | | | | | | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-061-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put Admin loggers in before_action for easier overriding in EE See merge request !14081
| * | | | | | | Put loggers in before_action for easier overriding in EEtc-test-admin-log-linksToon Claes2017-09-061-1/+8
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it easier to override the set of loggers, by putting them in a separate method. Also modify spec so it tests for links, instead of checking for regular text.
* | | | | | | Profile updates from providersAlexander Keramidas2017-09-061-2/+0
| |_|_|/ / / |/| | | | |
* | | | | | change collapse to resolve and comments to discussionsAshley Dumaine2017-09-061-1/+1
| | | | | |
* | | | | | Add functionality to collapse outdated diff comments regardless of ↵Ashley Dumaine2017-09-061-0/+1
| |_|/ / / |/| | | | | | | | | | | | | | discussion resolution
* | | | | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-053-6/+32
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | This changes the issue and MR index pages so the pagination system re-uses the output of the COUNT(*) query used to calculate the number of rows per state (opened, closed, etc). This removes the need for an additional COUNT(*) on both pages.
* | | | Move "Move to different project" to sidebar34261-move-move-to-sidebarEric Eastwood2017-09-032-18/+28
| |_|/ |/| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
* | | Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-022-21/+57
|\ \ \ | | | | | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069
| * \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-313-5/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| * \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-311-1/+1
| |\ \ \ \
View Lorry Controller Status