summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-0512-258/+4
* 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
| * | | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-035-19/+26
| * | | | | Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth pr...Timothy Andrew2017-07-031-1/+1
| * | | | | Add CHANGELOG entry for CE MR 11963Timothy Andrew2017-07-031-0/+4
| * | | | | Get ESLint spec passing for the `OAuthRememberMe` class.Timothy Andrew2017-07-031-6/+6
| * | | | | Add Omniauth OAuth config to the test section of `gitlab.yml`Timothy Andrew2017-07-032-51/+67
| * | | | | Add more providers to the OAuth login integration tests.Timothy Andrew2017-07-031-2/+41
| * | | | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-033-14/+33
| * | | | | Test the "Remember Me" flow for OAuth-based login.Timothy Andrew2017-07-033-3/+68
| * | | | | Add integration tests around OAuth login.Timothy Andrew2017-07-033-1/+66
| * | | | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-032-1/+26
* | | | | | Merge branch '34648-use-stub_application_setting-to-test-support_url' into 'm...Sean McGivern2017-07-051-1/+1
|\ \ \ \ \ \
| * | | | | | Use stub_application_setting when testing ApplicationHelper#support_url34648-use-stub_application_setting-to-test-support_urlRémy Coutable2017-07-041-1/+1
* | | | | | | Merge branch 'new-nav-column-fix' into 'master'Filipa Lacerda2017-07-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixes the column widths for the new navigation options in settingsPhil Hughes2017-07-051-2/+2
* | | | | | | | Merge branch 'sh-fix-bad-rails-logger' into 'master'Rémy Coutable2017-07-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rbsh-fix-bad-rails-loggerStan Hu2017-07-041-1/+1
* | | | | | | | | Merge branch 'sh-log-application-controller-exceptions-sentry' into 'master'Rémy Coutable2017-07-052-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Log rescued exceptions to Sentrysh-log-application-controller-exceptions-sentryStan Hu2017-07-042-0/+6
* | | | | | | | | | Merge branch 'feature/gb/add-test-example-for-commit-status-retries' into 'ma...Sean McGivern2017-07-051-0/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add test example for external commit status retriesfeature/gb/add-test-example-for-commit-status-retriesGrzegorz Bizon2017-07-051-0/+22
* | | | | | | | | | | Merge branch 'fix/gb/improve-stage-id-foreign-key-migration' into 'master'Kamil Trzciński2017-07-053-10/+41
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'fix/gb/improve-stage-id-foreign-key-migration'fix/gb/improve-stage-id-foreign-key-migrationGrzegorz Bizon2017-07-0429-72/+383
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Check foreign keys in migration in separate conditionalGrzegorz Bizon2017-07-041-1/+15
| * | | | | | | | | | | Bump database schema versionGrzegorz Bizon2017-07-041-1/+1
| * | | | | | | | | | | Improve stage_id in ci_builds foreign key migrationGrzegorz Bizon2017-07-032-9/+26
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '34531-remove-scroll' into 'master'Phil Hughes2017-07-055-170/+133
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert change to design. Go back to scrollable pageFilipa Lacerda2017-07-055-170/+133
|/ / / / / / / / / / /
View Lorry Controller Status