root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
61,753 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

301 Commits

Author SHA1 Message Date
Douwe Maan 5adae3d85b Encode Page-Title header as ISO-8859-1 2017-09-26 18:05:19 +02:00
Douwe Maan 711bb28568 Add Page-Title header to tree and blob JSON endpoints 2017-09-26 17:31:47 +02:00
Tiago Botelho 37383d9a9d Rollsback changes made to signing_enabled. 2017-09-01 10:51:40 +01:00
Rémy Coutable c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-08-09 11:52:22 +02:00
Bob Van Landuyt faabcbd3ae GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError 2017-08-07 14:37:01 +02:00
Bob Van Landuyt 3598e60bf2 Add a Circuitbreaker for storage paths 2017-08-04 15:38:48 +02:00
Stan Hu 9bc176b2c3 Add remote IP, user ID and username to JSON lograge output 
This makes the logs a bit more useful to search requests by users.
 2017-07-28 00:48:03 -05:00
Robin Bobbitt 672a68d372 Fixes needed when GitLab sign-in is not enabled 
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
 2017-07-13 10:08:27 -04:00
Rémy Coutable 186048a404 Allow to enable the performance bar per user or Flipper group 
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>
 2017-07-06 11:18:25 +02:00
Stan Hu 73d019e11f Log rescued exceptions to Sentry 
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.
 2017-07-04 14:03:46 -07:00
Pawel Chojnacki 15b7b9ec41 Add rescue_from(ActionController::UnknownFormat) in Application Controller 2017-06-20 15:53:23 +02:00
Rémy Coutable b173ae6b48 Fix linting, route, and specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-06-09 17:21:39 +02:00
Rémy Coutable f45094a485 Small adjustments 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-06-09 17:21:39 +02:00
Rémy Coutable 47054451da Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres group 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-06-09 17:21:39 +02:00
Rémy Coutable d39ecf1ca7 New performance bar that can be enabled with the `p b` shortcut 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-06-09 17:21:39 +02:00
Douwe Maan b3b6c78112 Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master' 
Bugfix: Always use the default language when generating emails.

Closes #32748

See merge request !11662
 2017-05-25 18:05:06 +00:00
Ruben Davila 5c921809cd Bugfix: Always use the default language when generating emails. 
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.
 2017-05-25 10:22:45 -05:00
Alexis Reigel 6efe9c2f14 atom links with rss token instead of private token 2017-05-24 22:29:59 +02:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
Ruben Davila dbd1bdaeed More updates for translations plus some refactoring. 2017-05-03 21:08:43 -05:00
Ruben Davila 6d5364cfb0 First round of updates from the code review. 2017-05-02 23:36:36 -05:00
Ruben Davila bbfbcebdf6 Merge branch 'master' into 28433-internationalise-cycle-analytics-page 2017-05-02 13:20:41 -05:00
Dosuken shinya 73ac7b2dd6 Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" 2017-04-28 09:38:32 +00:00
Ruben Davila 1de135bc04 Fix Rubocop complains plus some small refactor 2017-04-19 23:19:24 -05:00
Ruben Davila 73d0730d09 Set locale through controller filter 2017-04-13 01:03:47 -05:00
Markus Koller 7140e09e39 Extract 2FA-related code from ApplicationController 2017-04-06 10:01:13 +02:00
Markus Koller a3430f011f Support 2FA requirement per-group 2017-04-06 10:01:13 +02:00
Markus Koller 57374feabe Move AuthHelper#two_factor_skippable? into ApplicationController 2017-04-06 10:01:13 +02:00
Rémy Coutable 8b6041bce3 Don't try to find a user by personal_access_token if the token is nil 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-03-22 17:06:19 +01:00
http://jneen.net/ 0ea04cc5bf use the policy stack to protect logins 2017-03-09 11:49:52 -08:00
http://jneen.net/ 846e581732 use a magic default :global symbol instead of nil 
to make sure we mean the global permissions
 2017-03-09 11:49:52 -08:00
Pawel Chojnacki 2ff139ddee Make Warden set_user hook validate user ip uniquness 
+ rename shared context
 2017-03-06 15:41:25 +01:00
Pawel Chojnacki 0ef8a64348 Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR 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
 2017-03-06 15:41:25 +01:00
Paweł Chojnacki 76e96878aa Stop setting Strict-Transport-Securty header from within the app 2017-03-03 11:05:24 +00:00
Rémy Coutable b50b5a4461
Fix the redirect to custom home page URL and move it to RootController 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-02-27 16:51:23 +01:00
Douwe Maan 215228b477 Enable Performance/RedundantBlockCall 2017-02-23 09:31:57 -06:00
Douwe Maan f40716f48a No more and/or 2017-02-21 16:31:14 -06:00
Robert Speicher 191bcb4d1b Don't perform Devise trackable updates on blocked User records 2017-02-10 11:51:14 -05:00
Rémy Coutable 103114e3d7 Rename Gogs to Gitea, DRY the controller and improve views 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-12-19 17:35:51 +01:00
Kim "BKC" Carlbäcker 5d4531db25 Gogs Importer 2016-12-19 17:35:51 +01:00
Valery Sizov 32c6c9c457 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2 2016-11-30 14:53:30 +02:00
Douwe Maan a7a9db803b Merge branch 'dz-allow-nested-group-routing' into 'master' 
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
 2016-11-24 04:31:54 +00:00
Dmitriy Zaporozhets 6683fdcfb0
Add nested groups support to the routing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-11-23 14:08:36 +02:00
Douglas Barbosa Alexandre 267e27b0cd Remove code to clone Bitbucket repositories using SSH 2016-11-21 16:47:26 -08:00
Oren Kanner 8dd9a8b6e0 Allow admins to stop impersonating users without e-mail addresses 
Resolves #24576

Modify the guard clause of the `ApplicationController#require_email`
before action to skip requests where an admin is impersonating the
current user.
 2016-11-17 23:28:39 -05:00
Lin Jen-Shin 5416d0e083 Pass `@ref` along so we know which pipeline to show 
Closes #23615
 2016-10-24 22:26:06 +08:00
Sean McGivern 86dcb79be3 Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 10:56:55 +01:00
Dmitriy Zaporozhets 2b9a25bd5a
Handle unmatched routing with not_found method 
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>
 2016-10-15 00:36:22 +03:00
Sean McGivern 241cca011f Fix specs 2016-10-13 14:16:34 -05:00