summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-optimize-todos-controller' into 'master'Douglas Barbosa Alexandre2019-06-243-2/+3
|\ | | | | | | | | | | | | Eliminate N+1 queries in Dashboard::TodosController Closes #43042 See merge request gitlab-org/gitlab-ce!29954
| * Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-242-2/+2
| | | | | | | | | | Since this scope is used in both the controller and the API, we rename it to make it clear that it's used for both.
| * Eliminate N+1 queries in Dashboard::TodosControllerStan Hu2019-06-242-1/+2
| | | | | | | | | | | | | | This appears to bring down the number of SQL queries on GitLab.com for my Todos page from 672 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43042
* | Merge branch '63656-runner-tags-search-dropdown-is-empty' into 'master'Jan Provaznik2019-06-241-2/+1
|\ \ | |/ |/| | | | | | | | | Resolve "Runner tags search dropdown is empty" Closes #63656 See merge request gitlab-org/gitlab-ce!29985
| * Return all runner tags when search is empty63656-runner-tags-search-dropdown-is-emptyDmitriy Zaporozhets2019-06-241-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'jivanvl-add-column-chart-monitoring-dashboard' into 'master'Mike Greiling2019-06-241-0/+131
|\ \ | | | | | | | | | | | | Add column chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!29293
| * | Add column chart component to the monitoring bundlejivanvl-add-column-chart-monitoring-dashboardJose Vargas2019-06-211-0/+131
| | | | | | | | | | | | | | | This merge request just adds the column chart component without integrating it to the dashboard
* | | Resolve "Avatar in "Please sign in" pattern too large"Marcel van Remmerden2019-06-241-1/+1
| | |
* | | Merge branch 'divergence-graph-fe-rendering' into 'master'Filipa Lacerda2019-06-247-54/+173
|\ \ \ | | | | | | | | | | | | | | | | Render branch divergence graph with Vue See merge request gitlab-org/gitlab-ce!29743
| * | | Render branch divergance graph with VuePhil Hughes2019-06-247-54/+173
| | |/ | |/|
* | | Add identifiers for onboarding popoversMartin Wortschack2019-06-248-21/+15
| | | | | | | | | | | | | | | - Add button styles for onboarding welcome page - Fix qa selector (due to additional class)
* | | Merge branch 'search-blob-basenames' into 'master'Kamil Trzciński2019-06-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Build correct basenames for title search results See merge request gitlab-org/gitlab-ce!29898
| * | | Build correct basenames for title search resultssearch-blob-basenamesMarkus Koller2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.
* | | | Add name & search parameters to project environments APILee Tickett2019-06-241-0/+29
| | | |
* | | | Improve group list UIDennis Tang2019-06-249-103/+102
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the groups list UI to match the style of the project list: - New layout - Improve loading state when loading group children - Larger, responsive text - Icon and text colors changed to secondary - Smaller button sizes - Content list description colors were standardized to body text
* | | Merge branch 'fix-labels-in-hooks' into 'master'Ash McKenzie2019-06-241-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix label serialisation in issue and note hooks Closes #63473 See merge request gitlab-org/gitlab-ce!29850
| * | | Added labels_hook_attrs methodfix-labels-in-hooksJan Provaznik2019-06-241-0/+4
| | | | | | | | | | | | | | | | | | | | Based on review comment fetching labels hook_attrs is now wrapped in an issue's model method.
* | | | Show create merge request button on confidential issuesPhil Hughes2019-06-243-3/+21
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | | | Merge branch 'fix-pipeline-schedule-edge-case' into 'master'Lin Jen-Shin2019-06-241-6/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FIX: Scheduled pipelines scheduled to run at the same time as pipeline_schedule_worker gets pushed to the next run Closes #63469 See merge request gitlab-org/gitlab-ce!29848
| * | | | Fix pipeline schedule edge casefix-pipeline-schedule-edge-caseShinya Maeda2019-06-241-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If pipeline schedule is to run at the exact same time with when cron worker runs, the pipeline schedule will not be executed at the ideal timing. We fix this bug by comparing the exact matching of ideal and cron worker's next run at.
* | | | | Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-245-44/+153
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
| * | | | | Avoid touching the MR status if MR is not openedOswaldo Ferreira2019-06-212-5/+10
| | | | | |
| * | | | | Only force recheck when merge-ref is outdatedOswaldo Ferreira2019-06-201-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recheck flag is true, we make sure the merge-ref is indeed outdated. If it is, we update it along the merge status.
| * | | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-205-44/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | | | | | Merge branch 'gt-remove-tooltip-directive-on-project-avatar-image-component' ↵Filipa Lacerda2019-06-241-21/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove tooltip directive on project avatar image component Closes #51990 See merge request gitlab-org/gitlab-ce!29631
| * | | | | | Remove tooltip directive on project avatar image componentGeorge Tsiolis2019-06-211-21/+0
| | | | | | |
* | | | | | | Merge branch 'services-form-ee-differences' into 'master'Filipa Lacerda2019-06-241-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EE differences in services/_form.html.haml Closes gitlab-ee#11032 See merge request gitlab-org/gitlab-ce!29931
| * | | | | | | Fix EE differences in services/_form.html.hamlPhil Hughes2019-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11032
* | | | | | | | Fix notes email with group-level notification emailSean McGivern2019-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Noteable doesn't have a group directly, unless it's an epic - we need to look for the project's group to find the right email address.
* | | | | | | | Merge branch 'remove_create_deployment_from_build_success_worker' into 'master'Douwe Maan2019-06-241-12/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated call in BuildSuccessWorker Closes #63622 See merge request gitlab-org/gitlab-ce!29958
| * | | | | | | | Remove deprecated call in BuildSuccessWorkerremove_create_deployment_from_build_success_workerThong Kuah2019-06-241-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now create_deployment on Ci::Build create. No need to call create_deployment again
* | | | | | | | | Merge branch ↵Thong Kuah2019-06-243-43/+94
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-deleted-And-add-MR-option' into 'master' Skip TeamCity trigger on branch delete and support MR triggers Closes #13871 and #17690 See merge request gitlab-org/gitlab-ce!29836
| * | | | | | | | Extract common validations from ci servicesRaphael Tweitmann2019-06-213-48/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DroneCI and TeamCity shared the same validations methods on the data received. These validations were extracted into a concern
| * | | | | | | | Skip TeamCity on branch delete and add MR triggerNikolay Novikov2019-06-211-24/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a take over from a community contribution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20990 Skip TeamCity push event when related to branch delete Support merge request events for TeamCity service. Add checkbox for merge request triggers in the TeamCity configuration page.
* | | | | | | | | Merge branch 'update-pagination-texts' into 'master'Kushal Pandya2019-06-241-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pagination prev and next texts See merge request gitlab-org/gitlab-ce!29911
| * | | | | | | | | Update pagination prev and next textsupdate-pagination-textsPaul Gascou-Vaillancourt2019-06-201-2/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '60617-enable-project-cluster-jit' into 'master'Thong Kuah2019-06-243-14/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable JIT Kubernetes resource creation for project level clusters See merge request gitlab-org/gitlab-ce!29515
| * | | | | | | | | Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-183-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this behaviour was only available to group and instance-level clusters, as some project clusters relied on Kubernetes credentials being passed through to the runner instead of having their resources managed by GitLab (which is not available when using JIT). These clusters have been migrated to unmanaged, so resources can be created on demand for the remaining managed clusters.
* | | | | | | | | | Merge branch 'sh-strong-memoize-appearances' into 'master'Thong Kuah2019-06-241-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize non-existent custom appearances See merge request gitlab-org/gitlab-ce!29957
| * | | | | | | | | | Memoize non-existent custom appearancessh-strong-memoize-appearancesStan Hu2019-06-231-1/+4
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves about 5 SQL calls per page if no custom appearance is specified.
* | | | | | | | | | Merge branch 'sh-enable-ref-name-caching-discussions' into 'master'Ash McKenzie2019-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Gitaly ref name caching for discussions.json See merge request gitlab-org/gitlab-ce!29951
| * | | | | | | | | | Enable Gitaly ref name caching for discussions.jsonsh-enable-ref-name-caching-discussionsStan Hu2019-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminates many potential duplicate FindCommit RPCs for the same ref, which often occurs in the RelativeLinkFilter#current_commit call. On the GitLab 12.0 release post, for example, this would save close to 400 RPC calls.
* | | | | | | | | | | Merge branch 'sh-promote-remove-migration' into 'master'Thong Kuah2019-06-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-add ignore_column for import columns See merge request gitlab-org/gitlab-ce!29959
| * | | | | | | | | | | Re-add ignore_column for import columnsStan Hu2019-06-231-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This `ignore_column` was present for a while but recently removed, but to ensure we don't get error 500s let's keep it for a while.
* | | | | | | | | | | Merge branch 'reduce_prometheus_adapter' into 'master'Ash McKenzie2019-06-242-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve #has_metrics? and Environment#has_terminals? See merge request gitlab-org/gitlab-ce!29847
| * | | | | | | | | | Run least expensive method first - has_metrics?reduce_prometheus_adapterThong Kuah2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Success is relatively cheap compared to prometheus_adapter which can invoke deployment_platform which does a lot of work
| * | | | | | | | | | Run least expensive method first - #has_terminals?Thong Kuah2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | available? is much cheaper than deployment_platform
| * | | | | | | | | | Run least expensive method firstThong Kuah2019-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If environment is not available, then no point running the more expensive `prometheus_adapter`.
* | | | | | | | | | | Merge branch '11707-add-copy-to-clipboard-cursed-backport' into 'master'Fatih Acet2019-06-211-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Copy to Clipboard CE Backport See merge request gitlab-org/gitlab-ce!29906
| * | | | | | | | | | | Add CE backport11707-add-copy-to-clipboard-cursed-backportsarahghp2019-06-201-0/+6
| | |_|_|/ / / / / / / | |/| | | | | | | | |
View Lorry Controller Status