summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-072-2/+4
* 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::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 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
|\ \ \
| * \ \ Merge branch 'master' into '33929-allow-to-enable-perf-bar-for-a-group'Sean McGivern2017-07-07136-529/+2105
| |\ \ \ | | | |/ | | |/|
| * | | 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
| * | | | Allow to enable the Performance Bar for a group from the admin areaRémy Coutable2017-07-0613-54/+257
| * | | | Use Rails.cache instead of Redis directlyRémy Coutable2017-07-062-31/+8
| * | | | Improve Features API and its docs and add a Changelog itemRémy Coutable2017-07-066-19/+48
| * | | | Cache the allowed user IDs for the performance bar, in Redis for 10 minutesRémy Coutable2017-07-062-41/+63
| * | | | Document the Performance BarRémy Coutable2017-07-065-0/+57
| * | | | Improve feature flag check for the performance barRémy Coutable2017-07-066-7/+37
| * | | | Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-067-41/+32
| * | | | Document the feature groupsRémy Coutable2017-07-063-3/+18
| * | | | Address #34528 by improving the feature flags documentationRémy Coutable2017-07-061-1/+2
| * | | | Cache PerformanceBar data using RequestStoreRémy Coutable2017-07-063-18/+33
| * | | | Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-068-19/+151
* | | | | Merge branch 'new-admin-sidebar-jobs-fix' into 'master'Annabel Dunstone Gray2017-07-071-2/+2
|\ \ \ \ \
| * | | | | 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 batchesactive-record-each-batchYorick Peterse2017-07-078-1/+209
* | | | | | | 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 branchfix-mrs-merged-immediatelySean McGivern2017-07-073-12/+51
| |/ / / / / /
* | | | | | | Merge branch 'feature/user-agent-details-api' into 'master'Douwe Maan2017-07-0711-2/+211
|\ \ \ \ \ \ \
| * | | | | | | 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.34737-authentiq-oauth-feature-specTimothy Andrew2017-07-073-2/+6
* | | | | | | | Merge branch 'new-project-sidebar-overflow-fix' into 'master'Annabel Dunstone Gray2017-07-073-2/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 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 Gitalyfeature/migrate-commit-count-to-gitalyAhmad Sherif2017-07-076-53/+59
* | | | | | | | Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil Trzciński2017-07-0735-69/+953
|\ \ \ \ \ \ \ \