summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix SVG scaling issue2501-ce-port-update-welcome-pagekushalpandya2017-07-071-3/+5
* Fix missing `row` & `container` classeskushalpandya2017-07-072-4/+4
* Replace bootstrap overrides with scaling SVG on smaller screenskushalpandya2017-07-071-21/+1
* Add container bottom paddingkushalpandya2017-07-071-0/+1
* Fix icon container width with smaller desktop screenskushalpandya2017-07-071-2/+12
* Add container class `.row`kushalpandya2017-07-061-3/+3
* Reduce callout margin prop declarationkushalpandya2017-07-061-2/+1
* Fix margin override for mobilekushalpandya2017-07-061-0/+4
* Remove unnecessary column classkushalpandya2017-07-061-1/+1
* Rename variable to `public_project_count`kushalpandya2017-07-061-3/+3
* Make offset override specific to admin welcome pagekushalpandya2017-07-062-2/+11
* Override BS column offset marginkushalpandya2017-07-061-0/+1
* Fix column offset, add missing new line charkushalpandya2017-07-063-9/+9
* Add changelog entrykushalpandya2017-07-061-0/+4
* Update welcome page styleskushalpandya2017-07-061-7/+52
* Fix callout size to fit parent containerkushalpandya2017-07-061-2/+2
* Move welcome pages to individual partialskushalpandya2017-07-061-47/+12
* CE regular user welcome pagekushalpandya2017-07-061-0/+48
* CE admin welcome pagekushalpandya2017-07-061-0/+33
* Welcome page graphickushalpandya2017-07-065-0/+27
* 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
View Lorry Controller Status