summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'remove-ide' into 'master'Tim Zallmann2018-03-051-6/+0
|\ | | | | | | | | Remove IDE from CE See merge request gitlab-org/gitlab-ce!17458
| * Remove IDE from CEPhil Hughes2018-03-021-6/+0
| |
* | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'Sean McGivern2018-03-021-25/+19
|\ \ | | | | | | | | | | | | | | | | | | Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456
| * | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batchAhmad Sherif2018-03-011-25/+19
| | | | | | | | | | | | Closes gitaly#1046
* | | Allow to include also descendant group labelsJan Provaznik2018-03-021-1/+2
| | | | | | | | | | | | | | | | | | Because epic index page includes also epics from subgroups it's necessary to also get descendant group labels for filtering. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542
* | | Support additional LabelsFinder parameters for group labelsJan Provaznik2018-03-022-2/+8
| |/ |/| | | | | | | | | | | | | | | In some situations (listing labels for epics) we want to list only group ancestor labels, this is already supported in LabelsFinder we just need to enable additional parameters. Also `set_issuables_index` method now loads project labels only if @project is set (which is not used for epic group labels).
* | Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'Douwe Maan2018-03-014-19/+19
|\ \ | | | | | | | | | | | | Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
| * | Moved o_auth/saml/ldap modules under gitlab/authHoratiu Eugen Vlad2018-02-284-19/+19
| | |
* | | Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński2018-03-011-0/+5
|\ \ \ | | | | | | | | | | | | | | | | Display ingress IP address in the Kubernetes page See merge request gitlab-org/gitlab-ce!17052
| * \ \ Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gkeDylan Griffith2018-02-238-14/+32
| |\ \ \
| * | | | Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changesDylan Griffith2018-02-231-3/+3
| | | | | | | | | | | | | | | | | | | | (#42643)
| * | | | Schedule Ingress IP address fetch from K8s after clusters page load (#42643)Dylan Griffith2018-02-201-0/+5
| | | | |
* | | | | Removing the two factor check when the user sets a new passwordFrancisco Javier López2018-03-011-0/+1
| |_|_|/ |/| | |
* | | | PagesDomain: Add edit/update functionalityRob Watson2018-02-281-8/+21
| | | |
* | | | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-285-29/+81
| | | |
* | | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-274-56/+39
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Move the #update action from Project/Member controllers to the ↵Rémy Coutable2018-02-273-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Remove explicit audit event log in MembershipActionsRémy Coutable2018-02-273-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵Grzegorz Bizon2018-02-272-5/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
| * | | Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroupsSean McGivern2018-02-272-5/+0
| | | | | | | | | | | | | | | | | | | | Previously, these wouldn't count issues or MRs in subgroups - meaning that if _this_ group had no issues or MRs, we'd show the empty state, which was wrong.
* | | | Backport custom metrics ce componentsPaweł Chojnacki2018-02-232-24/+27
| | | |
* | | | Merge branch 'master' into '29497-pages-custom-domain-dns-verification'Robert Speicher2018-02-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ \ Merge branch ↵bjk/kube_state_metricsKamil Trzciński2018-02-231-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43496-error-message-for-gke-clusters-persists-in-the-next-page' into 'master' Resolve "Error message for GKE clusters persists in the next page" Closes #43496 See merge request gitlab-org/gitlab-ce!17299
| | * | | Do not persist Google Project Billing Failure errors after a reloadMatija Čupić2018-02-221-2/+2
| | | | |
* | | | | Add DNS verification to Pages custom domainsNick Thomas2018-02-231-3/+15
|/ / / /
* | | | Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'Phil Hughes2018-02-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep "Import project" tab/form active when validation fails trying to import "Repo by URL" Closes #43261 See merge request gitlab-org/gitlab-ce!17136
| * | | | Make import tab/form active when importing project by URL and validation fails43261-fix-import-from-url-name-collision-active-tabEric Eastwood2018-02-201-1/+1
| | |/ / | |/| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/43261
* | | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-2321-24/+92
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208
| * | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-2221-24/+92
| | | |
* | | | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into ↵Rémy Coutable2018-02-221-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add a button on the project page to set up a Kubernetes cluster and enable Auto DevOps Closes #42431 See merge request gitlab-org/gitlab-ce!16900
| * | | Move project presenter instance creation to controllerOswaldo Ferreira2018-02-221-0/+2
| |/ /
* | | Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-221-1/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix 500 error when loading an invalid upload URL Closes gitlab-ee#4998 See merge request gitlab-org/gitlab-ce!17267
| * | Fix 500 error when loading an invalid upload URLSean McGivern2018-02-221-1/+4
| | |
* | | Merge branch 'refactor-issuable-finder-to-use-inheritance' into 'master'Rémy Coutable2018-02-216-12/+22
|\ \ \ | |/ / |/| | | | | | | | Refactor IssuableFinder to extract model-specific logic See merge request gitlab-org/gitlab-ce!17236
| * | Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritanceSean McGivern2018-02-216-12/+22
| |/ | | | | | | | | | | | | | | | | By extracting a new `filter_items` method, we can override that in the IssuesFinder and MergeRequestsFinder separately, so we don't need checks that the model is the correct one, because we can just use the class we're in to know that. We can do the same for the VALID_PARAMS constant, by making it a class method.
* | Revert "Merge branch 'zj-n-1-root-show' into 'master'"Zeger-Jan van de Weg2018-02-201-1/+4
|/ | | This reverts merge request !16968
* Merge branch '41722-track-gcp-billing-enabled-project-changes' into 'master'Kamil Trzciński2018-02-141-8/+6
|\ | | | | | | | | | | | | Resolve "Track GCP Billing enabled project changes" Closes #41722 See merge request gitlab-org/gitlab-ce!16962
| * Refactor CheckGcpProjectBillingWorkerMatija Čupić2018-02-121-8/+6
| |
* | Merge branch '26466-natural-sort-mrs' into 'master'Sean McGivern2018-02-131-2/+1
|\ \ | |/ |/| | | | | | | | | Group MR numbers on issue show page by project and namespace Closes #26466 See merge request gitlab-org/gitlab-ce!8494
| * Change issue show page to group MRs by projects and namespacesJeff Stubler2018-02-131-2/+1
| | | | | | | | Closes #26466.
* | Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-02-091-17/+7
| | | | | | | | [10.4] Fix GH namespace security issue
* | Replace $.post in importer status with axiosClement Ho2018-02-095-38/+53
| |
* | Merge branch 'zj-n-1-root-show' into 'master'Douwe Maan2018-02-081-4/+1
|\ \ | | | | | | | | | | | | | | | | | | Remove N + 1 block for Root#show Closes #37434 and gitaly#996 See merge request gitlab-org/gitlab-ce!16968
| * | Don't allow N +1 calls from Root#showZeger-Jan van de Weg2018-02-071-4/+1
| | |
* | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-071-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
| * \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0638-130/+260
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| * \ \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-313-8/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-2915-55/+83
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-1722-15/+91
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | Manual Configuration instead of Activation. Prometheus Service just got a ↵Pawel Chojnacki2018-01-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bit weirder