| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix username and ID not logging in production_json.log for Git activitysh-fix-username-logging | Stan Hu | 2017-10-04 | 1 | -3/+12 |
| | | | | | | | | | Devise sets `current_user`, but not all controllers authenticate users by session tokens. Try to use the controller-defined `authenticated_user` if `current_user` is not available. Closes gitlab-org/gitlab-ee#3611 | ||||
| * | Encode Page-Title header as ISO-8859-1 | Douwe Maan | 2017-09-26 | 1 | -1/+2 |
| | | |||||
| * | Add Page-Title header to tree and blob JSON endpoints | Douwe Maan | 2017-09-26 | 1 | -0/+6 |
| | | |||||
| * | Rollsback changes made to signing_enabled. | Tiago Botelho | 2017-09-01 | 1 | -1/+1 |
| | | |||||
| * | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-cop | Rémy Coutable | 2017-08-09 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError | Bob Van Landuyt | 2017-08-07 | 1 | -1/+1 |
| | | |||||
| * | Add a Circuitbreaker for storage paths | Bob Van Landuyt | 2017-08-04 | 1 | -0/+22 |
| | | |||||
| * | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-output | Stan Hu | 2017-07-28 | 1 | -0/+10 |
| | | | | | This makes the logs a bit more useful to search requests by users. | ||||
| * | Fixes needed when GitLab sign-in is not enabled | Robin Bobbitt | 2017-07-13 | 1 | -1/+1 |
| | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController | ||||
| * | Allow to enable the performance bar per user or Flipper group | Rémy Coutable | 2017-07-06 | 1 | -16/+1 |
| | | | | | | | | | A `performance_team` Flipper group has been created. By default this group is nil but this can be customized in `gitlab.yml` via the performance_bar.allowed_group setting. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Log rescued exceptions to Sentrysh-log-application-controller-exceptions-sentry | Stan Hu | 2017-07-04 | 1 | -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. | ||||
| * | Add rescue_from(ActionController::UnknownFormat) in Application Controller | Pawel Chojnacki | 2017-06-20 | 1 | -0/+4 |
| | | |||||
| * | Fix linting, route, and specs | Rémy Coutable | 2017-06-09 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Small adjustments | Rémy Coutable | 2017-06-09 | 1 | -0/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres group | Rémy Coutable | 2017-06-09 | 1 | -0/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | New performance bar that can be enabled with the `p b` shortcut | Rémy Coutable | 2017-06-09 | 1 | -1/+14 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master' | Douwe Maan | 2017-05-25 | 1 | -6/+2 |
| |\ | | | | | | | | | | | | | Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662 | ||||
| | * | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-language | Ruben Davila | 2017-05-25 | 1 | -6/+2 |
| | | | | | | | | | | | | | There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request. | ||||
| * | | atom links with rss token instead of private token | Alexis Reigel | 2017-05-24 | 1 | -7/+25 |
| |/ | |||||
| * | Merge request widget redesign | Fatih Acet | 2017-05-09 | 1 | -1/+4 |
| | | |||||
| * | Redirect from redirect routes to canonical routes | Michael Kozono | 2017-05-05 | 1 | -1/+1 |
| | | |||||
| * | More updates for translations plus some refactoring. | Ruben Davila | 2017-05-03 | 1 | -9/+5 |
| | | |||||
| * | First round of updates from the code review. | Ruben Davila | 2017-05-02 | 1 | -4/+11 |
| | | |||||
| * | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-02 | 1 | -0/+4 |
| |\ | |||||
| | * | Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" | Dosuken shinya | 2017-04-28 | 1 | -0/+4 |
| | | | |||||
| * | | Fix Rubocop complains plus some small refactor | Ruben Davila | 2017-04-19 | 1 | -0/+1 |
| | | | |||||
| * | | Set locale through controller filter | Ruben Davila | 2017-04-13 | 1 | -0/+6 |
| |/ | |||||
| * | Extract 2FA-related code from ApplicationController | Markus Koller | 2017-04-06 | 1 | -39/+1 |
| | | |||||
| * | Support 2FA requirement per-group | Markus Koller | 2017-04-06 | 1 | -2/+10 |
| | | |||||
| * | Move AuthHelper#two_factor_skippable? into ApplicationController | Markus Koller | 2017-04-06 | 1 | -0/+7 |
| | | |||||
| * | Don't try to find a user by personal_access_token if the token is nil | Rémy Coutable | 2017-03-22 | 1 | -2/+5 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | use the policy stack to protect logins | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |
| | | |||||
| * | use a magic default :global symbol instead of nil | http://jneen.net/ | 2017-03-09 | 1 | -1/+1 |
| | | | | | to make sure we mean the global permissions | ||||
| * | Make Warden set_user hook validate user ip uniquness | Pawel Chojnacki | 2017-03-06 | 1 | -1/+1 |
| | | | | | + rename shared context | ||||
| * | Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵ | Pawel Chojnacki | 2017-03-06 | 1 | -0/+4 |
| | | | | | | | | | | | review - cleanup formating in haml - clarify time window is in seconds - cleanup straneous chunks in db/schema - rename count_uniqe_ips to update_and_return_ips_count - other | ||||
| * | Stop setting Strict-Transport-Securty header from within the app | Paweł Chojnacki | 2017-03-03 | 1 | -4/+0 |
| | | |||||
| * | Fix the redirect to custom home page URL and move it to RootController28609-fix-redirect-to-home-page-url | Rémy Coutable | 2017-02-27 | 1 | -21/+0 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Enable Performance/RedundantBlockCall | Douwe Maan | 2017-02-23 | 1 | -1/+1 |
| | | |||||
| * | No more and/or | Douwe Maan | 2017-02-21 | 1 | -4/+4 |
| | | |||||
| * | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-users | Robert Speicher | 2017-02-10 | 1 | -16/+1 |
| | | |||||
| * | Rename Gogs to Gitea, DRY the controller and improve views | Rémy Coutable | 2016-12-19 | 1 | -3/+3 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Gogs Importer | Kim "BKC" Carlbäcker | 2016-12-19 | 1 | -1/+5 |
| | | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2 | Valery Sizov | 2016-11-30 | 1 | -1/+9 |
| |\ | |||||
| | * | Merge branch 'dz-allow-nested-group-routing' into 'master' | Douwe Maan | 2016-11-24 | 1 | -0/+8 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add nested groups support to the routing ## What does this MR do? It allows routing with `/` in namespace name ## Why was this MR needed? For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7459 | ||||
| | | * | Add nested groups support to the routingdz-allow-nested-group-routing | Dmitriy Zaporozhets | 2016-11-23 | 1 | -0/+8 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Allow admins to stop impersonating users without e-mail addresses | Oren Kanner | 2016-11-17 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | | | Resolves #24576 Modify the guard clause of the `ApplicationController#require_email` before action to skip requests where an admin is impersonating the current user. | ||||
| * | | Remove code to clone Bitbucket repositories using SSH | Douglas Barbosa Alexandre | 2016-11-21 | 1 | -1/+1 |
| |/ | |||||
| * | Pass `@ref` along so we know which pipeline to show | Lin Jen-Shin | 2016-10-24 | 1 | -1/+2 |
| | | | | | Closes #23615 | ||||
| * | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 1 | -0/+4 |
| |\ | |||||
| | * | Handle unmatched routing with not_found method | Dmitriy Zaporozhets | 2016-10-15 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | We need this to prevent routing error when user access URL like /123 when there is no resource located under such name Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |