summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve Features API and its docs and add a Changelog item33929-allow-to-enable-perf-bar-for-a-groupRémy Coutable2017-07-056-19/+48
* Cache the allowed user IDs for the performance bar, in Redis for 10 minutesRémy Coutable2017-07-052-41/+63
* Document the Performance BarRémy Coutable2017-07-055-0/+57
* Improve feature flag check for the performance barRémy Coutable2017-07-056-7/+37
* Hide 'peek' by using 'performance bar' insteadRémy Coutable2017-07-057-41/+32
* Document the feature groupsRémy Coutable2017-07-053-3/+18
* Address #34528 by improving the feature flags documentationRémy Coutable2017-07-051-1/+2
* Cache PerformanceBar data using RequestStoreRémy Coutable2017-07-053-18/+33
* Allow to enable the performance bar per user or Flipper groupRémy Coutable2017-07-058-19/+151
* Merge branch 'gitignore-.rspec' into 'master'Robert Speicher2017-07-052-2/+1
|\
| * Allow developers to have custom rspec output settingsJacob Vosmaer2017-06-302-2/+1
* | Merge branch 'enable-a-few-rubocop-rspec-cops' into 'master'Robert Speicher2017-07-055-20/+20
|\ \
| * | Disable RSpec/BeforeAfterAll and enable RSpec/ImplicitExpect copsenable-a-few-rubocop-rspec-copsRémy Coutable2017-06-305-20/+20
* | | Merge branch 'dm-project-path-helpers-try-2' into 'master'Sean McGivern2017-07-05669-2404/+2185
|\ \ \
| * | | Add ProjectPathHelper copDouwe Maan2017-07-053-0/+93
| * | | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-05666-2404/+2092
* | | | Merge CHANGELOG.md updates from 9.3.5James Edwards-Jones2017-07-056-21/+8
|\ \ \ \
| * | | | Update CHANGELOG.md for 9.3.5James Edwards-Jones2017-07-056-21/+8
* | | | | Merge branch 'remove-more-iifes' into 'master'Clement Ho2017-07-0515-785/+763
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove IIFEs around several javascript classesMike Greiling2017-07-0515-785/+763
|/ / / /
* | | | Merge branch 'sh-disable-flipper-midddlware-tests' into 'master'Rémy Coutable2017-07-051-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Disable Flipper memoizer in tests to avoid transient failuressh-disable-flipper-midddlware-testsStan Hu2017-07-051-2/+4
* | | | Merge branch 'environments-realtime' into 'master'Phil Hughes2017-07-054-34/+45
|\ \ \ \
| * | | | Handles realtime with 2 states for environments tableFilipa Lacerda2017-07-054-34/+45
|/ / / /
* | | | Merge branch 'revert-6df61942' into 'master'Douwe Maan2017-07-0512-258/+4
|\ \ \ \
| * | | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-0512-258/+4
* | | | | Merge branch '34578-sidebar-padding' into 'master'Phil Hughes2017-07-053-2/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix sidebar padding for full-width items (Time Tracking help)34578-sidebar-paddingSimon Knox2017-07-053-2/+9
| |/ / /
* | | | Merge branch '23036-replace-snippets-spinach' into 'master'Rémy Coutable2017-07-0511-207/+57
|\ \ \ \
| * | | | Replace 'snippets/snippets.feature' spinach with rspecAlexander Randa2017-07-0511-207/+57
* | | | | Merge branch '32838-admin-panel-spacing' into 'master'Annabel Dunstone Gray2017-07-053-161/+179
|\ \ \ \ \
| * | | | | 32838 Add wells to admin dashboard overview to fix spacing problems32838-admin-panel-spacingtauriedavis2017-06-283-161/+179
* | | | | | Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-0515-41/+291
|\ \ \ \ \ \
| * | | | | | Fix build for !12300.Timothy Andrew2017-07-051-14/+35
| * | | | | | Merge branch 'master' into '33580-fix-api-scoping'Douwe Maan2017-07-04522-5990/+16017
| |\ \ \ \ \ \
| * | | | | | | `AccessTokenValidationService` accepts `String` or `API::Scope` scopes.Timothy Andrew2017-06-304-9/+15
| * | | | | | | Extract a `Gitlab::Scope` class.Timothy Andrew2017-06-295-24/+42
| * | | | | | | Implement review comments from @DouweM for !12300.Timothy Andrew2017-06-284-14/+28
| * | | | | | | Implement review comments from @dbalexandre for !12300.Timothy Andrew2017-06-283-22/+18
| * | | | | | | Fix remaining spec failures for !12300.Timothy Andrew2017-06-286-16/+15
| * | | | | | | Add CHANGELOG entry for CE MR 12300Timothy Andrew2017-06-281-0/+4
| * | | | | | | Test OAuth token scope verification in the `API::Users` endpointTimothy Andrew2017-06-283-14/+71
| * | | | | | | When verifying scopes, manually include scopes from `API::API`.Timothy Andrew2017-06-282-10/+23
| * | | | | | | Test `/users` endpoints for the `read_user` scope.Timothy Andrew2017-06-284-34/+78
| * | | | | | | Allow API scope declarations to be applied conditionally.Timothy Andrew2017-06-286-16/+54
| * | | | | | | Initial attempt at refactoring API scope declarations.Timothy Andrew2017-06-288-20/+63
* | | | | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-0512-4/+258
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Jasmine tests for `OAuthRememberMe`Timothy Andrew2017-07-042-0/+31
| * | | | | | | | Fix build for !11963.Timothy Andrew2017-07-033-24/+6
| * | | | | | | | Implement review comments for !11963 from @filipa.Timothy Andrew2017-07-032-4/+5
View Lorry Controller Status