summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Backport generic methods to CEce-fix_vuln_list_on_group_dashboardOlivier Gonzalez2018-11-052-0/+10
| | | | | | | Allow to fetch all pipelines for every projects in a group and its subgroups. Allow to fetch the latest pipeline id for each projects of a group and its subgroups.
* Merge branch 'fix-codequality' into 'master'testing-review-app-passwordGrzegorz Bizon2018-11-051-1/+1
|\ | | | | | | | | Fix invalid artifact path for codequality See merge request gitlab-org/gitlab-ce!22816
| * Fix invalid artifact path for codequalityfix-codequalityKamil Trzciński2018-11-051-1/+1
| |
* | Merge branch '48239-performance-info-ref' into 'master'Stan Hu2018-11-052-10/+7
|\ \ | | | | | | | | | | | | | | | | | | Performance tuning on Projects::GitHttpController#info_refs Closes #48239 See merge request gitlab-org/gitlab-ce!22013
| * | Combine two updates in one queryMark Chao2018-11-051-9/+3
| | |
| * | Memorize project to avoid re-queryMark Chao2018-11-051-1/+4
| | | | | | | | | | | | [skip ci]
* | | Remove gitlab-ui's tooltip from globalClement Ho2018-11-054-4/+13
| | |
* | | Fix pipeline schedule style issuesScott Hampton2018-11-052-4/+10
| | |
* | | Merge branch 'disallow-retry-of-old-builds' into 'master'Grzegorz Bizon2018-11-0512-18/+80
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Disallow retry of old builds Closes #50939 See merge request gitlab-org/gitlab-ce!22538
| * | | Allow to make builds soft-archived.disallow-retry-of-old-buildsKamil Trzciński2018-11-0512-18/+80
| | |/ | |/| | | | | | | | | | The soft-archived builds cannot be run after some deadline time. The intent is to aggressively recycle old builds after sometime.
* | | Merge branch 'use_tokenauthenticatable_method_for_token_lookup' into 'master'Sean McGivern2018-11-052-7/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove PersonalAccessTokensFinder#find_by method See merge request gitlab-org/gitlab-ce!22617
| * | | Remove PersonalAccessTokensFinder#find_by methoduse_tokenauthenticatable_method_for_token_lookupImre Farkas2018-11-052-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | find_by_token is overriden by TokenAuthenticatable which can be easily missed or confused with #find_by(:token) defined by ActiveRecord. First step for safer usage is to remove #find_by.
* | | | Merge branch '52300-pool-repositories' into 'master'Sean McGivern2018-11-053-0/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start tracking pool repositories Closes #38238 and #52300 See merge request gitlab-org/gitlab-ce!22482
| * | | | Start tracking pool repositoriesNick Thomas2018-11-052-0/+23
| | | | |
| * | | | Start tracking shards in the databaseNick Thomas2018-11-051-0/+26
| | |_|/ | |/| |
* | | | Merge branch 'sh-fix-issue-52176' into 'master'Yorick Peterse2018-11-051-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable replication lag check for Aurora PostgreSQL databases Closes #52176 See merge request gitlab-org/gitlab-ce!22786
| * | | | Disable replication lag check for Aurora PostgreSQL databasessh-fix-issue-52176Stan Hu2018-11-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replication slots are not supported in Aurora. Attempting to check the lag results in the message: ``` ActiveRecord::StatementInvalid: PG::FeatureNotSupported: ERROR: Replication slots are currently not supported in Aurora : SELECT pg_xlog_location_diff(pg_current_xlog_insert_location(), restart_lsn)::... ``` To avoid breaking support for background migrations in Aurora, we just disable the check if we encounter this error. This change also now checks whether there are any replication slots present in the primary before checking the replication lag. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52176
* | | | | Merge branch 'gt-update-project-and-group-labels-empty-state' into 'master'Annabel Dunstone Gray2018-11-054-5/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update project and group labels empty state See merge request gitlab-org/gitlab-ce!22745
| * | | | | Remove empty state button margin on small viewportsGeorge Tsiolis2018-11-031-0/+1
| | | | | |
| * | | | | Update project and group labels empty stateGeorge Tsiolis2018-11-023-5/+8
| | | | | |
* | | | | | Add 'only history' option to notes filterFelipe Artur2018-11-0512-8/+46
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'scheduled-manual-jobs-environment-play-buttons' into 'master'Tim Zallmann2018-11-057-49/+64
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the Play button for delayed jobs in environment page Closes #52129 See merge request gitlab-org/gitlab-ce!22106
| * | | | | Fix bad merge in ↵scheduled-manual-jobs-environment-play-buttonsWinnie Hellmann2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | app/assets/javascripts/environments/components/environment_item.vue
| * | | | | Use secondary text color for delayed job timerWinnie Hellmann2018-10-221-1/+4
| | | | | |
| * | | | | Add permission check for delayed job actionsWinnie Hellmann2018-10-221-6/+2
| | | | | |
| * | | | | Update confirmation modal text for starting delayed jobs immediatelyWinnie Hellmann2018-10-222-2/+2
| | | | | |
| * | | | | Merge branch 'master' into scheduled-manual-jobs-environment-play-buttonsWinnie Hellmann2018-10-22534-7488/+8343
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: spec/javascripts/environments/environment_actions_spec.js
| * | | | | | Make frontend files prettierWinnie Hellmann2018-10-152-2/+7
| | | | | | |
| * | | | | | Fix issue URL of TODO in environment_actions.vueWinnie Hellmann2018-10-091-1/+1
| | | | | | |
| * | | | | | Add feature flags for scheduled jobs in environments listWinnie Hellmann2018-10-091-1/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'gitlab.com/master' into ↵Winnie Hellmann2018-10-09254-1100/+2346
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | scheduled-manual-jobs-environment-play-buttons
| * | | | | | | Display scheduled job actions on environments listWinnie Hellmann2018-10-083-43/+45
| | | | | | | |
| * | | | | | | Add scheduled actions in deployment entityShinya Maeda2018-10-043-2/+11
| | | | | | | |
* | | | | | | | Merge branch 'qa-batch-comments-e2e-tests' into 'master'Nick Thomas2018-11-056-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA Selectors for Batch Comment E2E Automation See merge request gitlab-org/gitlab-ce!22681
| * | | | | | | | Updating selectors for diff lineat.ramya2018-10-301-1/+1
| | | | | | | | |
| * | | | | | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-301-1/+1
| | | | | | | | |
| * | | | | | | | Updating selectors for diff lineat.ramya2018-10-302-2/+2
| | | | | | | | |
| * | | | | | | | QA Selectors for Batch Comment E2E Automationat.ramya2018-10-306-8/+8
| | | | | | | | |
* | | | | | | | | Merge branch 'fast_project_blob_path' into 'master'Douwe Maan2018-11-057-39/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of tree rendering in repositories with a lot of items See merge request gitlab-org/gitlab-ce!16511
| * | | | | | | | | Improve performance of tree rendering in repositories with lots of itemsDrew Blessing2018-10-317-39/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails is slow to generate paths dynamically especially when called hundreds/thousands of times. Also, rendering many partials hundreds of times can be slower. This change reduces the number of partials rendered and introduces two fast path methods to speed up path generation.
* | | | | | | | | | Merge branch '51259-ci-cd-gitlab-ui' into 'master'Phil Hughes2018-11-0511-50/+69
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses gitlab-ui components in jobs components. See merge request gitlab-org/gitlab-ce!22780
| * | | | | | | | | | Uses gitlab-ui components in jobs components.51259-ci-cd-gitlab-uiFilipa Lacerda2018-11-0211-50/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes old buttons,links and tooltips and uses the new gitlab-ui components.
* | | | | | | | | | | Merge branch 'toggle-sidebar-alignment' into 'master'Phil Hughes2018-11-052-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align toggle sidebar button across all browsers and OSs See merge request gitlab-org/gitlab-ce!22771
| * | | | | | | | | | Align toggle sidebar button across all browsers and OSstoggle-sidebar-alignmentAnnabel Dunstone Gray2018-11-022-2/+3
| | | | | | | | | | |
* | | | | | | | | | | Optimize merge request refresh by using the database to check commit SHAssh-optimize-mr-commit-sha-lookupStan Hu2018-11-023-5/+21
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously for a given merge request, we would: 1. Create the array of commit SHAs involved in the push (A) 2. Request all merge request commits and map the SHA (B) 3. Reload the diff if there were any common commits between A and B We can avoid additional database querying and overhead by checking with the database whether the merge request contains any of the commit SHAs. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/53213
* | | | | | | | | | Add email for milestone changeChantal Rollison2018-11-0216-2/+139
| | | | | | | | | |
* | | | | | | | | | Incorporates Kubernetes Namespace into Cluster's flowThong Kuah2018-11-0213-41/+246
| | | | | | | | | |
* | | | | | | | | | Merge branch '51620-cannot-add-label-to-issue-from-board' into 'master'Douwe Maan2018-11-024-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cannot add label to issue from board Closes #51620 See merge request gitlab-org/gitlab-ce!22475
| * | | | | | | | | | Rename to assignable_labels_endpoint51620-cannot-add-label-to-issue-from-boardBrett Walker2018-10-313-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Dynamically store the valid label endpointBrett Walker2018-10-314-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to ensure we have the right endpoint to query for an issue's possible valid labels, we store that url in the issue object that gets passed to the frontend.