summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-072-2/+4
| | | | | | 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-0714-22/+36
|\ | | | | | | | | | | | | 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-0714-22/+36
| |
* | Merge branch 'gitaly-get-blob' into 'master'Sean McGivern2017-07-076-18/+77
|\ \ | | | | | | | | | | | | 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-076-17/+67
| | |
* | | Merge branch '33929-allow-to-enable-perf-bar-for-a-group' into 'master'Sean McGivern2017-07-0724-44/+469
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-07136-529/+2105
| |\ \ \ | | | |/ | | |/| | | | | # Conflicts: # db/schema.rb
| * | | Fix performance bar specsSean McGivern2017-07-071-5/+10
| | | |
| * | | Fix performance bar cookieSean McGivern2017-07-071-1/+1
| | | |
| * | | Merge branch 'master' into 33929-allow-to-enable-perf-bar-for-a-groupSean McGivern2017-07-07238-1060/+3211
| |\ \ \
| * | | | Don't use Flipper for the Performance BarRémy Coutable2017-07-079-164/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0613-54/+257
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Use Rails.cache instead of Redis directlyRémy Coutable2017-07-062-31/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Improve Features API and its docs and add a Changelog itemRémy Coutable2017-07-066-19/+48
| | | | | | | | | | | | | | | | | | | | 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-062-41/+63
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Document the Performance BarRémy Coutable2017-07-065-0/+57
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Improve feature flag check for the performance barRémy Coutable2017-07-066-7/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-067-41/+32
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Document the feature groupsRémy Coutable2017-07-063-3/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Address #34528 by improving the feature flags documentationRémy Coutable2017-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Cache PerformanceBar data using RequestStoreRémy Coutable2017-07-063-18/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-068-19/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'new-admin-sidebar-jobs-fix' into 'master'Annabel Dunstone Gray2017-07-071-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed jobs page not being in new admin sidebar See merge request !12710
| * | | | | Fixed jobs page not being in new admin sidebarnew-admin-sidebar-jobs-fixPhil Hughes2017-07-071-2/+2
| | | | | |
* | | | | | Merge branch 'active-record-each-batch' into 'master'Sean McGivern2017-07-078-1/+209
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added EachBatch for iterating tables in batches See merge request !12707
| * | | | | | Added EachBatch for iterating tables in batchesactive-record-each-batchYorick Peterse2017-07-078-1/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-mrs-merged-immediately' into 'master'Robert Speicher2017-07-073-12/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't mark empty MRs as merged on push to the target branch Closes #32800 See merge request !12711
| * | | | | | | Don't mark empty MRs as merged on push to the target branchfix-mrs-merged-immediatelySean McGivern2017-07-073-12/+51
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we push to an MR's target branch, we check if the MR's HEAD commit is contained in the push. This lets us mark MRs as merged if they were merged manually. However, we also added a feature where you can create an empty MR from an issue. If that MR is created around the time of a merge to the default branch, we would process the push after creating the MR, and consider it to be a manual merge. To fix that, we exclude empty MRs from this process. If they are empty, they were empty before the push we're processing, so we shouldn't touch them!
* | | | | | | Merge branch 'feature/user-agent-details-api' into 'master'Douwe Maan2017-07-0711-2/+211
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admins to retrieve user agent details for an issue or snippet Closes #29508 See merge request !12655
| * | | | | | | fix spec order issueJames Lopez2017-07-071-23/+22
| | | | | | | |
| * | | | | | | add spec and project snippet user agent details endpointJames Lopez2017-07-074-0/+39
| | | | | | | |
| * | | | | | | update docsJames Lopez2017-07-072-0/+36
| | | | | | | |
| * | | | | | | refactor code based on feedbackJames Lopez2017-07-067-9/+7
| | | | | | | |
| * | | | | | | fix docsJames Lopez2017-07-062-2/+6
| | | | | | | |
| * | | | | | | fix specJames Lopez2017-07-061-0/+1
| | | | | | | |
| * | | | | | | add missing changelogJames Lopez2017-07-061-0/+4
| | | | | | | |
| * | | | | | | add API documentationJames Lopez2017-07-062-0/+49
| | | | | | | |
| * | | | | | | add user agent details API endpoints to issues and snippetsJames Lopez2017-07-063-1/+35
| | | | | | | |
| * | | | | | | add snippets specJames Lopez2017-07-061-1/+21
| | | | | | | |
| * | | | | | | add issues spec and user agent details to entitiesJames Lopez2017-07-062-0/+25
| | | | | | | |
* | | | | | | | Merge branch '34737-authentiq-oauth-feature-spec' into 'master'Douwe Maan2017-07-073-2/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test logging in via the Authentiq OAuth provider in a feature spec Closes #34737 See merge request !12694
| * | | | | | | Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-073-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The `migration:path-pg` build was previously failing when the Authentiq feature spec was enabled by placing Authentiq configuration in the `test` section of `gitlab.yml` - The `migration:path-pg` task checks out an old revision of the codebase (`v8.14.10`) and runs a `schema:load`. It then checks out the commit under test, and runs `db:migrate`, to verify that migrations run without errors. - The problem here is that `v8.14.10` does not have the Authentiq module installed, but is run with the `gitlab.yml` for `master`, which would contain the `Authentiq` configuration in the `test` section. - The solution was to use the `v8.14.10` `gitlab.yml` for the `schema:load`, rather than the `gitlab.yml` from master.
* | | | | | | | Merge branch 'new-project-sidebar-overflow-fix' into 'master'Annabel Dunstone Gray2017-07-073-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed text overflow issue in new sidebars See merge request !12648
| * | | | | | | | Fixed text overflow issue in new sidebarsPhil Hughes2017-07-073-2/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'new-breadcrumbs-alerts-below' into 'master'Annabel Dunstone Gray2017-07-073-4/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Moves alert boxes to below the breadcrumbs See merge request !12631
| * | | | | | | Moves alert boxes to below the breadcrumbsPhil Hughes2017-07-073-4/+8
|/ / / / / / /
* | | | | | | Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master'Robert Speicher2017-07-076-53/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-076-53/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#355
* | | | | | | | Merge branch ↵Kamil Trzciński2017-07-0735-69/+953
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' Add variables to pipelines schedules Closes #32568 See merge request !12372
View Lorry Controller Status