summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-074-10/+33
|\
| * Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master'Robert Speicher2017-07-072-5/+20
| |\
| | * Migrate Gitlab::Git::Repository#commit_count to Gitalyfeature/migrate-commit-count-to-gitalyAhmad Sherif2017-07-072-5/+20
| * | Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil Trzciński2017-07-071-3/+6
| |\ \
| | * \ Merge from master(Fix conflicts)Shinya Maeda2017-07-073-26/+21
| | |\ \
| | * | | Remove update|admin_pipeline_schedule from Project, and grant it in PipelineS...Kamil Trzcinski2017-07-071-3/+6
| * | | | Native group milestonesFelipe Artur2017-07-071-2/+7
| | |/ / | |/| |
* | | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-0717-129/+242
|\ \ \ \ | |/ / /
| * | | Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'Kamil Trzciński2017-07-071-0/+1
| |\ \ \
| | * | | 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
| | |/ /
| * | | Merge branch 'gitaly-mandatory' into 'master'Sean McGivern2017-07-072-26/+20
| |\ \ \ | | |/ / | |/| |
| | * | 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 APIRémy Coutable2017-07-072-2/+18
| | |/ /
| * | | 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
| |\ \ \
| | * | | 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 commitsSean McGivern2017-07-063-9/+33
| * | | | | 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-2112Lin Jen-Shin2017-07-063-3/+33
| * | | | | Merge branch '33360-generate-kubeconfig' into 'master'Kamil Trzciński2017-07-061-0/+39
| |\ \ \ \ \
| | * | | | | 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
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Fix rubocop offense33360-generate-kubeconfigLin Jen-Shin2017-06-161-4/+4
| | * | | | | Generate KUBECONFIG in KubernetesService#predefined_variablesLin Jen-Shin2017-06-161-0/+39
| * | | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Douwe Maan2017-07-061-2/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-061-2/+1
| | * | | | | Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth pr...Timothy Andrew2017-07-061-1/+1
| * | | | | | Merge branch '33657-user-projects-api' into 'master'Rémy Coutable2017-07-062-49/+67
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Add user projects APIvanadium232017-07-062-49/+67
* | | | | | | Don't use Flipper for the Performance BarRémy Coutable2017-07-072-18/+3
* | | | | | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-061-8/+10
* | | | | | | Use Rails.cache instead of Redis directlyRémy Coutable2017-07-061-22/+7
* | | | | | | Improve Features API and its docs and add a Changelog itemRémy Coutable2017-07-061-12/+17
* | | | | | | Cache the allowed user IDs for the performance bar, in Redis for 10 minutesRémy Coutable2017-07-061-17/+35
* | | | | | | Improve feature flag check for the performance barRémy Coutable2017-07-062-3/+5
* | | | | | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-062-12/+7
* | | | | | | Cache PerformanceBar data using RequestStoreRémy Coutable2017-07-061-7/+22
* | | | | | | Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-062-3/+27
|/ / / / / /
* | | | | | Merge branch '33772-readonly-gitlab-ci-cache' into 'master'Kamil Trzciński2017-07-062-3/+13
|\ \ \ \ \ \
| * | | | | | Introduce cache policies for CI jobsNick Thomas2017-07-052-3/+13
* | | | | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-062-0/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-051-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-0521-99/+365
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-052-2/+2
| * | | | | | | | Fix various descriptions given the feedbackLin Jen-Shin2017-07-041-1/+1