summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-03198-895/+2148
|\
| * Merge branch 'sh-improve-redis-peek' into 'master'Sean McGivern2019-07-032-42/+6
| |\ | | | | | | | | | | | | Add Redis call details in Peek performance bar See merge request gitlab-org/gitlab-ce!30191
| | * Add Redis call details in Peek performance barsh-improve-redis-peekStan Hu2019-07-022-42/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Redis timings appear to be increasing in production, this change makes it easier to see what exactly which queries are being called and where. This is done by prepending modules in peek-redis to store the call details. This commit redact values for all SET commands (e.g. HMSET, GETSET, etc.).
| * | Show upcoming status for releasesJason Goodman2019-07-034-5/+18
| | | | | | | | | | | | | | | | | | Add released_at field to releases API Add released_at column to releases table Return releases to the API sorted by released_at
| * | Rebased and squashed commitsNatalia Tepluhina2019-07-0318-127/+392
| | | | | | | | | | | | - all commits squashed to make danger review happy
| * | Replace slugifyWithHyphens with improved slugify functionLuke Ward2019-07-033-6/+13
| | |
| * | Merge branch 'rj-fix-manual-order' into 'master'Kushal Pandya2019-07-031-1/+1
| |\ \ | | | | | | | | | | | | | | | | Don't let logged out user do manual order See merge request gitlab-org/gitlab-ce!30264
| | * | Don't let logged out user do manual orderrj-fix-manual-orderRajat Jain2019-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add a check for logged out user in the manual order so that they don't see an flash message when they try to reorder issues.
| * | | Merge branch 'vue-i18n-js-ide-directory' into 'master'Tim Zallmann2019-07-035-14/+22
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/ide directory See merge request gitlab-org/gitlab-ce!29967
| | * | Vue-i18n: app/assets/javascripts/ide directoryvue-i18n-js-ide-directoryEzekiel Kigbo2019-07-015-14/+22
| | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/ide directory
| * | | Fix typo in updateResolvableDiscussionsCounts actionWinnie Hellmann2019-07-022-7/+7
| | | |
| * | | Add username to deploy tokensKrasimir Angelov2019-07-024-3/+22
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This new attribute is optional and used when set instead of the default format `gitlab+deploy-token-#{id}`. Empty usernames will be saved as null in the database. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/50228.
| * | Merge branch '12534-clusters' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Backports css class used in EE specs Closes gitlab-ee#12534 See merge request gitlab-org/gitlab-ce!30258
| | * | Backports css class used in EE specs12534-clustersFilipa Lacerda2019-07-021-1/+1
| | | |
| * | | Merge branch '12537-settings-general' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/groups/settings/_general.html.haml Closes gitlab-ee#12537 See merge request gitlab-org/gitlab-ce!30257
| | * | | Removes EE differences12537-settings-generalFilipa Lacerda2019-07-021-1/+1
| | |/ /
| * | | Merge branch '63690-issue-trackers-title' into 'master'Dmitriy Zaporozhets2019-07-028-66/+66
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use title and description fields for issue trackers Closes #63690 See merge request gitlab-org/gitlab-ce!30096
| | * | | Use title and description fields for issue trackers63690-issue-trackers-titleJarka Košanová2019-07-028-66/+66
| | | | | | | | | | | | | | | | | | | | | | | | | - instead of using properties - backward compatibility has to be kept for now
| * | | | Includes logic to persist namespace statisticsMayra Cabrera2019-07-029-2/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add two new ActiveRecord models: - RootNamespaceStoragestatistics will persist root namespace statistics - NamespaceAggregationSchedule will save information when a new update to the namespace statistics needs to be scheduled - Inject into UpdateProjectStatistics concern a new callback that will call an async job to insert a new row onto NamespaceAggregationSchedule table - When a new row is inserted a new job is scheduled. This job will update call an specific service to update the statistics and after that it will delete thee aggregated scheduled row - The RefresherServices makes heavy use of arel to build composable queries to update Namespace::RootStorageStatistics attributes. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows
| * | | | Registry component now includes error messagesNick Kipling2019-07-026-60/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes changes to the Vue container registry component to support the display of an empty message and error message when invalid characters are found in the group, project or branch name. repositories/index.html.haml has been changed to remove the content and place into Vue component.
| * | | | Enables ingress for uninstallationJoão Cunha2019-07-023-15/+12
| | | | | | | | | | | | | | | | | | | | - JupyterHub must not be available (installed or updated)
| * | | | Allow adding new entries to existing pathDenys Mishunov2019-07-027-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an entry has been removed from the tree and later, during the same session, a user is trying to add a new item with the same name/path we should allow for that as long as the original entry is marked with `deleted`.
| * | | | Merge branch '12532-services-form' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/admin/services/_form.html.haml Closes gitlab-ee#12532 See merge request gitlab-org/gitlab-ce!30231
| | * | | | Removes EE differences12532-services-formFilipa Lacerda2019-07-011-1/+1
| | | | | |
| * | | | | Merge branch 'sh-add-thread-memory-cache' into 'master'Rémy Coutable2019-07-025-8/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a memory cache local to the thread to reduce Redis load Closes #63977 See merge request gitlab-org/gitlab-ce!30233
| | * | | | Use an uncached application setting for usage ping checksStan Hu2019-07-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of the in-memory cache for application settings had a side effect of making it harder to invalidate changes when the settings occur. We now bypass the cache because it's possible the admin enabled the usage ping, and we don't want to annoy the user again if they already set the value. To avoid causing significant load on the system, we add an extra check to ensure the user is an admin. and we don't want to annoy the user again if they already set the value. This is a bit of hack, but the alternative would be to put in a more complex cache invalidation step. Since this call only gets called in the uncommon situation where the user is an admin and the only user in the instance, this shouldn't cause too much load on the system.
| | * | | | Fix broken specs due to cached application settingsStan Hu2019-07-012-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The /admin panel will now always return an uncached application setting to ensure it always has the most current info.
| | * | | | Add a memory cache local to the thread to reduce Redis loadStan Hu2019-07-012-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading `ApplicationSetting` from Redis was responsible for at least 50% of the CPU load of the Redis cluster on GitLab.com. Since these values generally don't change very much, we can load this from the database and cache it in memory, skipping Redis altogther. We use `ActiveSupport::Cache::MemoryStore` as a drop-in replacement for `RedisCacheStore` even though we probably don't need synchronized access within `Thread.current`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63977
| * | | | | Memoizing root_ancestor in NamespaceAdam Hegyi2019-07-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The root_ancestor method is heavily used in EE for the group_saml feature. Having this memoization implemented in CE would eliminate the need of overriding the root_ancestor method in EE.
| * | | | | QA: transfer project specJennifer Louie2019-07-025-7/+7
| | | | | |
| * | | | | Merge branch '63984-rename-in-folder' into 'master'Kushal Pandya2019-07-021-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Hid re-named entries in subfolders Closes #63984 See merge request gitlab-org/gitlab-ce!30242
| | * | | | Hid re-named entries in subfolders63984-rename-in-folderDenys Mishunov2019-07-021-1/+1
| | | | | |
| * | | | | Vue-i18n: app/assets/javascripts/clusters/ directoryEzekiel Kigbo2019-07-023-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/clusters/ directory
| * | | | | Merge branch '82-add-new-onboarding-to-flipper-a-b-testing' into 'master'Nick Thomas2019-07-012-0/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Add new onboarding to flipper A/B testing See merge request gitlab-org/gitlab-ce!30125
| | * | | | Add A/B testing support to onboarding82-add-new-onboarding-to-flipper-a-b-testingAsh McKenzie2019-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if we're gitlab.com and the :user_onboarding feature flag is enabled.
| | * | | | Add new OnboardingExperimentHelper modulesAsh McKenzie2019-06-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnboardingExperimentHelpers take care of determining if the current_user should or should not see the new onboarding feature.
| * | | | | Vue-i18n: app/assets/javascripts/environments directoryEzekiel Kigbo2019-07-014-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/environments directory
| * | | | | Merge branch '63590-pipeline-actions-cause-full-refresh' into 'master'Phil Hughes2019-07-013-4/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Pipeline actions cause full refresh" Closes #63590 See merge request gitlab-org/gitlab-ce!30190
| | * | | | | Fix pipelines table update after action63590-pipeline-actions-cause-full-refreshshampton2019-06-283-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pipelines table was showing the loading icon after the user cancelled or retried a pipeline. This fixes that so the pipeline updates without removing the table from the DOM.
| * | | | | | Don't show tooltips on Open and Closed boardsMartin Hanzel2019-07-011-2/+4
| | | | | | |
| * | | | | | Allow JupyterHub to be uninstalledJoão Cunha2019-07-012-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enabled uninstallation - give it a specific uninstall message - ajust specs
| * | | | | | Merge branch 'divergence-graph-api-call' into 'master'Filipa Lacerda2019-07-014-25/+48
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch branches divergence graph data through API call Closes #46139 See merge request gitlab-org/gitlab-ce!30068
| | * | | | | Fetch branch diverging counts from APIPhil Hughes2019-07-014-25/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46139
| * | | | | | Merge branch 'vue-i18n-js-pipelines-directory' into 'master'Kushal Pandya2019-07-012-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/pipelines directory See merge request gitlab-org/gitlab-ce!30015
| | * | | | | | Vue-i18n: app/assets/javascripts/pipelines directoryvue-i18n-js-pipelines-directoryEzekiel Kigbo2019-07-012-4/+4
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/pipelines directory
| * | | | | | Merge branch 'vue-i18n-js-pages-directory' into 'master'Kushal Pandya2019-07-013-9/+45
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/pages directory See merge request gitlab-org/gitlab-ce!29978
| | * | | | | | Moved feature access arrays to constantsvue-i18n-js-pages-directoryEzekiel Kigbo2019-07-013-7/+41
| | | | | | | |
| | * | | | | | Vue-i18n: app/assets/javascripts/pages directoryEzekiel Kigbo2019-07-012-7/+9
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/pages directory
| * | | | | | Merge branch 'move-colon-on-merge-request-notification' into 'master'Douwe Maan2019-07-011-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move colon on merge request notification See merge request gitlab-org/gitlab-ce!30178
| | * | | | | | Move colon on merge request notificationGeorge Tsiolis2019-07-011-1/+1
| | |/ / / / /
View Lorry Controller Status