summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Make BackgroundTransaction#labels publicPawel Chojnacki2017-11-071-2/+0
* Merge branch '39903-restore-backup-warning' into 'master'Douwe Maan2017-11-071-17/+22
|\
| * show better message when deciding not to continue39903-restore-backup-warningdigitalMoksha2017-11-071-17/+22
| * Make warning message more explicitdigitalMoksha2017-11-071-1/+1
* | Merge branch 'fix/import-export-arguments' into 'master'Douwe Maan2017-11-071-1/+1
|\ \
| * | fix specsfix/import-export-argumentsJames Lopez2017-11-071-1/+1
| * | Fix arguments error on Import/Export fetch_ref methodJames Lopez2017-11-071-1/+1
| |/
* | Merge branch '39831-warning-icon-in-jobs-dropdown-has-incorrect-style' into '...Clement Ho2017-11-071-1/+1
|\ \
| * | Fixed Status Warning Icon39831-warning-icon-in-jobs-dropdown-has-incorrect-styleTim Zallmann2017-11-061-1/+1
* | | Merge branch 'fix-mysql-grant-check' into 'master'Rémy Coutable2017-11-071-11/+19
|\ \ \ | |_|/ |/| |
| * | Fix TRIGGER checks for MySQLfix-mysql-grant-checkYorick Peterse2017-11-061-11/+19
* | | Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1...Douwe Maan2017-11-073-11/+9
|\ \ \
| * | | Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-requestRémy Coutable2017-11-061-4/+1
| * | | Improve performance of the /projects/:id/repository/branches API endpointRémy Coutable2017-11-063-8/+9
| | |/ | |/|
* | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-075-2/+14
|\ \ \
| * | | Support custom attributes on groupsMarkus Koller2017-11-061-1/+8
| * | | Support custom attributes on projectsMarkus Koller2017-11-064-1/+6
* | | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master'Rémy Coutable2017-11-071-0/+4
|\ \ \ \
| * | | | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-apiSean McGivern2017-11-031-0/+4
* | | | | Fix GFM reference links for closed milestonesbugfix_banzai_closed_milestonesVitaliy @blackst0ne Klachkov2017-11-071-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'refactor-clusters' into 'master'Grzegorz Bizon2017-11-064-19/+5
|\ \ \ \
| * \ \ \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-064-9/+118
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into refactor-clustersShinya Maeda2017-11-055-4/+89
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0335-194/+193
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0212-36/+233
| |\ \ \ \ \
| * | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-012-5/+5
| * | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0136-73/+494
| |\ \ \ \ \ \
| * | | | | | | specs for featureShinya Maeda2017-11-011-1/+0
| * | | | | | | This worksShinya Maeda2017-10-231-13/+0
* | | | | | | | Merge branch 'pawel/metrics-to-prometheus-33643' into 'master'Grzegorz Bizon2017-11-0621-350/+684
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing mutex guard to method call metricspawel/metrics-to-prometheus-33643Pawel Chojnacki2017-11-031-12/+21
| * | | | | | | | Make subscriber tests pass, after refactoring metricsPawel Chojnacki2017-11-022-4/+4
| * | | | | | | | Use Mutex to guard metrics creation in transaction. Switch action view to thr...Pawel Chojnacki2017-11-022-28/+49
| * | | | | | | | move metrics for ActiveRecord, RailsCache and queue duration to instance vari...Pawel Chojnacki2017-11-023-38/+40
| * | | | | | | | rename BackgroundMigration to SidekiqMigrationPawel Chojnacki2017-11-023-2/+2
| * | | | | | | | Fix sidekiq middleware testsPawel Chojnacki2017-11-023-6/+5
| * | | | | | | | Remove unnecessary namespace usePawel Chojnacki2017-11-022-7/+7
| * | | | | | | | Tests for Web transaction and remove simple transactonPawel Chojnacki2017-11-025-264/+33
| * | | | | | | | Web/Sidekiq transaction splitPawel Chojnacki2017-11-023-1/+262
| * | | | | | | | Move labels to be initialized in constructorPawel Chojnacki2017-11-021-5/+2
| * | | | | | | | Avoid using Send (but is it better?) + small rubocop cleanupPawel Chojnacki2017-11-022-10/+8
| * | | | | | | | Cleanup metrics names and removing unnecessary cache read totalPawel Chojnacki2017-11-021-15/+5
| * | | | | | | | Adjust test to changed metrics methods.Pawel Chojnacki2017-11-021-1/+1
| * | | | | | | | Convert rails_queue_duration to metric_rails_queue_duration_secondsPawel Chojnacki2017-11-021-1/+12
| * | | | | | | | Add info about prometheus bucketsPawel Chojnacki2017-11-022-7/+9
| * | | | | | | | Guard metrics creation with a mutexPawel Chojnacki2017-11-021-7/+23
| * | | | | | | | Move labels tests from Metrics rack spec to Transaction specPawel Chojnacki2017-11-022-19/+19
| * | | | | | | | Fix rspec errors, and add more tests to MethodCall and ActionViewPawel Chojnacki2017-11-022-5/+21
| * | | | | | | | Fix Active record and transaction specsPawel Chojnacki2017-11-021-1/+1
| * | | | | | | | Fix rubocop warningsPawel Chojnacki2017-11-024-4/+3
View Lorry Controller Status