summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-071-1/+3
| | | | | | Identified via `ENABLE_BULLET=1 bundle exec rspec spec/requests/api/merge_requests_spec.rb:34` Improves speed of #34159
* Merge branch 'dm-fix-project-path-helpers-production' into 'master'Douwe Maan2017-07-076-5/+25
|\ | | | | | | | | | | | | Include new URL helpers retroactively into includers of Gitlab::Routing Closes #34821 See merge request !12716
| * Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-productionDouwe Maan2017-07-076-5/+25
| |
* | Merge branch 'gitaly-get-blob' into 'master'Sean McGivern2017-07-072-13/+62
|\ \ | | | | | | | | | | | | Add gitaly_git_blob_raw feature See merge request !12712
| * | Add git_blob_load_all_data feature flagJacob Vosmaer2017-07-071-1/+10
| | |
| * | Add gitaly_git_blob_raw featureJacob Vosmaer2017-07-072-12/+52
| |/
* | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master'Sean McGivern2017-07-072-14/+45
|\ \ | | | | | | | | | | | | | | | | | | Allow to enable the performance bar per user or Feature group Closes #33929 and #34528 See merge request !12362
| * \ Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-074-10/+33
| |\ \ | | |/ | | | | | | # Conflicts: # db/schema.rb
| * | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-0717-129/+242
| |\ \
| * | | Don't use Flipper for the Performance BarRémy Coutable2017-07-072-18/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation now simply rely on the `performance_bar_allowed_group_id` Application Setting. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-8/+10
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Use Rails.cache instead of Redis directlyRémy Coutable2017-07-061-22/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Improve Features API and its docs and add a Changelog itemRémy Coutable2017-07-061-12/+17
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Cache the allowed user IDs for the performance bar, in Redis for 10 minutesRémy Coutable2017-07-061-17/+35
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Improve feature flag check for the performance barRémy Coutable2017-07-062-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-062-12/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Cache PerformanceBar data using RequestStoreRémy Coutable2017-07-061-7/+22
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-062-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A `performance_team` Flipper group has been created. By default this group is nil but this can be customized in `gitlab.yml` via the performance_bar.allowed_group setting. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'active-record-each-batch' into 'master'Sean McGivern2017-07-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added EachBatch for iterating tables in batches See merge request !12707
| * | | | Added EachBatch for iterating tables in batchesactive-record-each-batchYorick Peterse2017-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module provides a class method called `each_batch` that can be used to iterate tables in batches in a more efficient way compared to Rails' `in_batches` method. This commit also includes a RuboCop cop to blacklist the use of `in_batches` in favour of this new method.
* | | | | Merge branch 'feature/user-agent-details-api' into 'master'Douwe Maan2017-07-074-0/+54
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Allow admins to retrieve user agent details for an issue or snippet Closes #29508 See merge request !12655
| * | | | add spec and project snippet user agent details endpointJames Lopez2017-07-071-0/+16
| | | | |
| * | | | refactor code based on feedbackJames Lopez2017-07-063-5/+3
| | | | |
| * | | | add user agent details API endpoints to issues and snippetsJames Lopez2017-07-062-0/+34
| | | | |
| * | | | add issues spec and user agent details to entitiesJames Lopez2017-07-061-0/+6
| | | | |
* | | | | Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master'Robert Speicher2017-07-072-5/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#commit_count to Gitaly Closes gitaly#355 See merge request !12688
| * | | | | Migrate Gitlab::Git::Repository#commit_count to Gitalyfeature/migrate-commit-count-to-gitalyAhmad Sherif2017-07-072-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#355
* | | | | | Merge branch ↵Kamil Trzciński2017-07-071-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' Add variables to pipelines schedules Closes #32568 See merge request !12372
| * \ \ \ \ \ Merge from master(Fix conflicts)Shinya Maeda2017-07-073-26/+21
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Remove update|admin_pipeline_schedule from Project, and grant it in ↵Kamil Trzcinski2017-07-071-3/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PipelineSchedule
* | | | | | Native group milestonesFelipe Artur2017-07-071-2/+7
| |/ / / / |/| | | |
* | | | | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Group secret variables Closes #12729 See merge request !12582
| * | | | | Add dash for GROUP_ROUTESShinya Maeda2017-07-071-0/+1
| | | | | |
| * | | | | Wrap additional routes by dash(-). And remove those routes from path_regex.rb.Shinya Maeda2017-07-071-2/+0
| | | | | |
| * | | | | Basic BE changeShinya Maeda2017-07-071-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Basic BE change Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Implement CURD Rename codes related to VariableGroup and VariableProject FE part Remove unneccesary changes Make Fe code up-to-date Add protected flag to migration file Protected group variables essential package Update schema Improve doc Fix logic and spec for models Fix logic and spec for controllers Fix logic and spec for views(pre feature) Add feature spec Fixed bugs. placeholder. reveal button. doc. Add changelog Remove unnecessary comment godfat nice catches Improve secret_variables_for arctecture Fix spec Fix StaticAnlysys & path_regex spec Revert "Improve secret_variables_for arctecture" This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1. Use ayufan suggestion for secret_variables_for Use find instead of find_by Fix spec message for variable is invalid Fix spec remove variable.group_id = group.id godffat spec nitpicks Use include Gitlab::Routing.url_helpers for presenter spec
* | | | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-072-26/+20
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Remove option to disable Gitaly in Rails See merge request !12677
| * | | | Remove option to disable Gitaly completelyJacob Vosmaer2017-07-072-26/+20
| | | | |
* | | | | Merge branch '33748-fix-n-plus-1-query-in-the-projects-api' into 'master'Robert Speicher2017-07-072-2/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some N+1 queries in the GET /projects API Closes #33748 See merge request !12679
| * | | | | Fix some N+1 queries in the GET /projects APIRémy Coutable2017-07-072-2/+18
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Improve & fix the performance bar UI and behaviorRémy Coutable2017-07-062-4/+30
| | | | |
* | | | | Merge branch 'acet-fix-tooltip-placement' into 'master'Jacob Schatz2017-07-061-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown preview tooltip cut off issue Closes #31748 See merge request !12367
| * | | | | Banzai: Add tooltip attributes to reference filter.acet-fix-tooltip-placementFatih Acet2017-07-031-0/+2
| | | | | |
* | | | | | Merge branch 'merge-request-commits-table' into 'master'Douwe Maan2017-07-063-9/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add table for merge request commits Closes #30224 See merge request !12527
| * | | | | | Add table for merge request commitsSean McGivern2017-07-063-9/+33
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an ID-less table with just three columns: an association to the merge request diff the commit belongs to, the relative order of the commit within the merge request diff, and the commit SHA itself. Previously we stored much more information about the commits, so that we could display them even when they were deleted from the repo. Since 8.0, we ensure that those commits are kept around for as long as the target repo itself is, so we don't need to duplicate that data in the database.
* | | | | | Just draw :legacy_builds34702-draw-legacy-buildsLin Jen-Shin2017-07-061-36/+0
|/ / / / /
* | | | | Merge branch '34716-environment-specific-variables-ce' into 'master'Douwe Maan2017-07-063-3/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports for ee-2112 Closes #34716 See merge request !12671
| * | | | | Backports for ee-2112Lin Jen-Shin2017-07-063-3/+33
| | |_|_|/ | |/| | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
* | | | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-061-0/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate KUBECONFIG in KubernetesService#predefined_variables Closes #33360 See merge request !12223
| * | | | | Encode certificate-authority-data in base64Lin Jen-Shin2017-07-061-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into 33360-generate-kubeconfigLin Jen-Shin2017-07-06188-920/+3205
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (888 commits) Fix Rubocop offense Use a previous approach for cycle analytics dummy pipeline Allow admin to disable all restricted visibility levels Removes file_name_regex from Gitlab::Regex Remove IIFEs around several javascript classes Update CHANGELOG.md for 9.3.5 Add ProjectPathHelper cop Create and use project path helpers that only need a project, no namespace Handles realtime with 2 states for environments table Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" Allow creation of files and directories with spaces in web UI Disable Flipper memoizer in tests to avoid transient failures Introduce cache policies for CI jobs fix sidebar padding for full-width items (Time Tracking help) Replace 'snippets/snippets.feature' spinach with rspec Rename ci_config_file to ci_config_path Add back Pipeline#ci_yaml_file_path due to all the troubles Revert change to design. Go back to scrollable page Fix cycle analytics tests by making pipeline valid Fixes the column widths for the new navigation options in settings ...
View Lorry Controller Status