summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-05333-1046/+853
|
* Handles realtime with 2 states for environments tableFilipa Lacerda2017-07-053-34/+24
|
* Merge branch 'revert-6df61942' into 'master'Douwe Maan2017-07-054-46/+1
|\ | | | | | | | | Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'" See merge request !12660
| * Revert "Merge branch '18000-remember-me-for-oauth-login' into 'master'"revert-6df61942Sean McGivern2017-07-054-46/+1
| | | | | | This reverts merge request !11963
* | Merge branch '34578-sidebar-padding' into 'master'Phil Hughes2017-07-052-2/+5
|\ \ | |/ |/| | | | | | | | | fix sidebar padding for full-width items (Time Tracking help) Closes #34578 See merge request !12650
| * fix sidebar padding for full-width items (Time Tracking help)34578-sidebar-paddingSimon Knox2017-07-052-2/+5
| |
* | Merge branch '32838-admin-panel-spacing' into 'master'Annabel Dunstone Gray2017-07-052-161/+175
|\ \ | | | | | | | | | | | | | | | | | | 32838 Add wells to admin dashboard overview to fix spacing problems Closes #32838 See merge request !12467
| * | 32838 Add wells to admin dashboard overview to fix spacing problems32838-admin-panel-spacingtauriedavis2017-06-282-161/+175
| | |
* | | Merge branch '33580-fix-api-scoping' into 'master'Douwe Maan2017-07-051-6/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix API Scoping Closes #33580 and #33022 See merge request !12300
| * \ \ Merge branch 'master' into '33580-fix-api-scoping'Douwe Maan2017-07-04240-2736/+4368
| |\ \ \ | | | | | | | | | | | | | | | # Conflicts: # lib/api/users.rb
| * | | | `AccessTokenValidationService` accepts `String` or `API::Scope` scopes.Timothy Andrew2017-06-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | - There's no need to use `API::Scope` for scopes that don't have `if` conditions, such as in `lib/gitlab/auth.rb`.
| * | | | Extract a `Gitlab::Scope` class.Timothy Andrew2017-06-291-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | - To represent an authorization scope, such as `api` or `read_user` - This is a better abstraction than the hash we were previously using.
| * | | | Implement review comments from @DouweM for !12300.Timothy Andrew2017-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use a struct for scopes, so we can call `scope.if` instead of `scope[:if]` - Refactor the "remove scopes whose :if condition returns false" logic to use a `select` rather than a `reject`.
| * | | | Fix remaining spec failures for !12300.Timothy Andrew2017-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Get the spec for `lib/gitlab/auth.rb` passing. - Make the `request` argument to `AccessTokenValidationService` optional - `auth.rb` doesn't need to pass in a request. - Pass in scopes in the format `[{ name: 'api' }]` rather than `['api']`, which is what `AccessTokenValidationService` now expects. 2. Get the spec for `API::V3::Users` passing 2. Get the spec for `AccessTokenValidationService` passing
| * | | | Allow API scope declarations to be applied conditionally.Timothy Andrew2017-06-281-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Scope declarations of the form: allow_access_with_scope :read_user, if: -> (request) { request.get? } will only apply for `GET` requests - Add a negative test to a `POST` endpoint in the `users` API to test this. Also test for this case in the `AccessTokenValidationService` unit tests.
| * | | | Initial attempt at refactoring API scope declarations.Timothy Andrew2017-06-281-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Declaring an endpoint's scopes in a `before` block has proved to be unreliable. For example, if we're accessing the `API::Users` endpoint - code in a `before` block in `API::API` wouldn't be able to see the scopes set in `API::Users` since the `API::API` `before` block runs first. - This commit moves these declarations to the class level, since they don't need to change once set.
* | | | | Merge branch '18000-remember-me-for-oauth-login' into 'master'Sean McGivern2017-07-054-1/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Honor the "Remember me" parameter for OAuth-based login Closes #18000 See merge request !11963
| * | | | | Fix build for !11963.Timothy Andrew2017-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't use `request.env['omniauth.params']` if it isn't present. - Remove the `saml` section from the `gitlab.yml` test section. Some tests depend on this section not being initially present, so it can be overridden in the test. This MR doesn't add any tests for SAML, so we didn't really need this in the first place anyway. - Clean up the test -> omniauth section of `gitlab.yml`
| * | | | | Implement review comments for !11963 from @filipa.Timothy Andrew2017-07-032-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable an ESLint check rather than work around it (by converting `OAuthRememberMe` from a regular class to a static class. - Scope `$` calls inside `OAuthRememberMe`
| * | | | | Implement review comments for !11963 from @adamniedzielski.Timothy Andrew2017-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change double quotes to single quotes. - Why is `OmniAuth.config.full_host` being reassigned in the integration test? - Use `map` over `map!` to avoid `dup` in the `gitlab:info` rake task - Other minor changes
| * | | | | Get ESLint spec passing for the `OAuthRememberMe` class.Timothy Andrew2017-07-031-6/+6
| | | | | |
| * | | | | Move OAuth "remember me" javascript logic into a class.Timothy Andrew2017-07-033-14/+33
| | | | | |
| * | | | | Add integration tests around OAuth login.Timothy Andrew2017-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There was previously a test for `saml` login in `login_spec`, but this didn't seem to be passing. A lot of things didn't seem right here, and I suspect that this test hasn't been running. I'll investigate this further. - It took almost a whole working day to figure out this line: OmniAuth.config.full_host = ->(request) { request['REQUEST_URI'].sub(request['REQUEST_PATH'], '') } As always, it's obvious in retrospect, but it took some digging to figure out tests were failing and returning 404s during the callback phase. - Test all OAuth providers - github, twitter, bitbucket, gitlab, google, and facebook
| * | | | | Implement "remember me" for OAuth-based login.Timothy Andrew2017-07-032-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass a `remember_me` query parameter along with the initial OAuth request, and pick this parameter up during the omniauth callback from request.env['omniauth.params']` - For 2FA-based login, copy the `remember_me` param from `omniauth.params` to `params`, which the 2FA process will pick up. - For non-2FA-based login, simply call the `remember_me` devise method to set the session cookie.
* | | | | | Merge branch 'new-nav-column-fix' into 'master'Filipa Lacerda2017-07-051-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the column widths for the new navigation option See merge request !12644
| * | | | | | Fixes the column widths for the new navigation options in settingsPhil Hughes2017-07-051-2/+2
| | | | | | |
* | | | | | | Merge branch 'sh-log-application-controller-exceptions-sentry' into 'master'Rémy Coutable2017-07-051-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log rescued exceptions to Sentry See merge request !12638
| * | | | | | | Log rescued exceptions to Sentrysh-log-application-controller-exceptions-sentryStan Hu2017-07-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support noticed that a number of exceptions, such as "Encoding::CompatibilityError (incompatible character encodings: UTF-8 and ASCII-8BIT)", failed to report to Sentry. The `rescue_from` in the ApplicationController prevented these exceptions from being recorded. This change ensures that these exceptions are properly captured.
* | | | | | | | Revert change to design. Go back to scrollable pageFilipa Lacerda2017-07-054-170/+129
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'monitoring-dashboard-fine-tuning-ux' into 'master'Phil Hughes2017-07-053-10/+22
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Improve the overall UX for the new monitoring dashboard See merge request !12616
| * | | | | | Improve the overall UX for the new monitoring dashboardmonitoring-dashboard-fine-tuning-uxJose Ivan Vargas2017-07-043-10/+22
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master'Sean McGivern2017-07-041-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Closes #34456 See merge request !12574
| * | | | | | Prevent accidental deletion of protected MR source branch by repeating ↵dm-always-verify-source-branch-can-be-deletedDouwe Maan2017-07-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | checks before actual deletion
* | | | | | | Merge branch 'revert-2c879643' into 'master'Sean McGivern2017-07-043-4/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'revert-12499' into 'master'" See merge request !12633
| * | | | | | | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-043-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !12557
* | | | | | | | Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'Rémy Coutable2017-07-041-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Closes #32035 See merge request !11218
| * | | | | | | | chaining the methods in ref_slugStefan Hanreich2017-06-241-3/+4
| | | | | | | | |
| * | | | | | | | using bang method for gsubStefan Hanreich2017-06-181-2/+2
| | | | | | | | |
| * | | | | | | | updated regex to use beginning / ending of string metacharactersStefan Hanreich2017-06-181-1/+1
| | | | | | | | |
| * | | | | | | | no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Fixes #32035Stefan Hanreich2017-06-181-1/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'enable-new-navigation-option-in-preferences' into 'master'Filipa Lacerda2017-07-043-26/+18
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Enables the option in user preferences to turn on the new navigation See merge request !12630
| * | | | | | | | Enables the option in user preferences to turn on the new navigationenable-new-navigation-option-in-preferencesPhil Hughes2017-07-043-26/+18
| | | | | | | | |
* | | | | | | | | Remove group modal like remove project modal. Closes #33130Diego Souza2017-07-042-6/+14
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge branch 'zj-i18n-pipeline-charts' into 'master'Douwe Maan2017-07-044-17/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strings ready for translation; Pipeline charts See merge request !12480
| * | | | | | | | Strings ready for translation; Pipeline chartszj-i18n-pipeline-chartsZ.J. van de Weg2017-07-034-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier, this was part of another MR, but that got split. Didn't pick that commit, as there were many merge conflicts. Vim macros seemed faster.
* | | | | | | | | Merge branch 'tc-namespace-license-checks--multiple-assignees' into 'master'Douwe Maan2017-07-0410-37/+101
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE counterpart of: Namespace license checks for multiple assignees See merge request !11825
| * | | | | | | | | Ensure /reassign does not assign multiple usersToon Claes2017-06-201-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the assignee to last user in the array if multiple assignees aren't allowed. Also, use `parse_params` where possible.
| * | | | | | | | | Make MergeRequest respond to assignee_ids & assignee_ids=Toon Claes2017-06-203-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it simpler to assign users to an Issuable, make MergeRequest support the attribute `assignee_ids`.
| * | | | | | | | | Backport /reassign quick commandToon Claes2017-06-201-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The /reassign quick command works even when no multiple assignees are allowed of there isn't any assignee yet. So for consistency, it's also be backported to CE. But it functions the same as the /assign quick action.
| * | | | | | | | | Backport issuable for assignee slash commands from EEToon Claes2017-06-202-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid conflicts when merge CE to EE by backporting code from EE. Instead of checking in `SlashCommands::InterpretService` what the issuable the type of the issuable is, ask the issuable if it is capable to do those thing and implement it in the issuable itself. The issuable will check if it's possible and if the licensed feature is available. This should also make it easier to ever add multiple assignees to MergeRequests.