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
56,778 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

3037 Commits

Author SHA1 Message Date
Douwe Maan 76c3d2d434 Add full JSON endpoints for issue notes and discussions 2017-07-21 22:35:24 +03:00
Fatih Acet cb2287df0a Notes bundle for the issue discussions refactor. 2017-07-21 22:35:24 +03:00
Filipa Lacerda b7d372d942 Merge branch '31031-convert-protected-branches-es6' into 'master' 
Convert Protected Branches feature JS code to ES6

See merge request !12970
 2017-07-21 09:50:29 +00:00
Stan Hu bbf5723774 Merge branch 'sh-lograge-iso6801-time' into 'master' 
Standardize on ISO8601 UTC time for lograge

See merge request !12995
 2017-07-20 21:58:29 +00:00
Stan Hu 68529f4f80 Standardize on ISO8601 UTC time for lograge 2017-07-20 07:58:01 -07:00
Robert Speicher b6555693a8 Merge branch 'rc/cob-backport-ce-to-ee-fix' into 'master' 
Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLogging

See merge request !12987
 2017-07-20 14:29:36 +00:00
Kamil Trzciński 542b675cf6 Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master' 
Fix docker tag reference routing constraints

Closes #35220 and gitlab-com/support-forum#2246

See merge request !12961
 2017-07-20 11:50:21 +00:00
Rémy Coutable ba74f38946 Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLogging 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-20 11:16:12 +02:00
Sean McGivern 88df076fae Merge branch '33359-pers-snippet-files-location' into 'security-9-3' 
Use uploads/system directory for personal snippets

See merge request !2123
 2017-07-19 22:28:27 -05:00
kushalpandya 584f323a69 Update Protected Branches bundle path 2017-07-19 18:16:15 +05:30
Rémy Coutable 0579a89fb9 Merge branch 'authentiq-updates' into 'master' 
Added authentiq provider to tests and updated documentation, gem and config file.

See merge request !12952
 2017-07-19 12:16:58 +00:00
Sean McGivern fca7a77a23 Merge branch 'bvl-free-system-namespace' into 'master' 
Free `system` namespace by moving uploads into `uploads/-`

Closes #33550

See merge request !12917
 2017-07-19 09:09:15 +00:00
Paweł Chojnacki 2c3d52161a Update Prometheus gem to version that explicitly calls `munmap` 2017-07-19 08:54:39 +00:00
Sean McGivern 1c7893c5c1 Merge branch 'rc/bump-peek-performance_bar' into 'master' 
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch

See merge request !12939
 2017-07-19 08:52:01 +00:00
Sean McGivern 9492fbc447 Merge branch 'sh-structured-logging' into 'master' 
Add structured logging for Rails processes

See merge request !12928
 2017-07-19 08:44:04 +00:00
Grzegorz Bizon 9f36012e02 Fix docker tag reference routing constraints 2017-07-19 10:30:57 +02:00
Rémy Coutable 3f50f6ca5b Merge branch 'rs-disable-test-log-in-ci' into 'master' 
Disable Rails logging in CI test environments

See merge request !12847
 2017-07-18 19:29:35 +00:00
Stan Hu e2b1c16ade Add structured logging for Rails processes 
This introduces JSON logging for Rails views saved to a file called
`development_json.log`, `production_json.log`, etc.

For example, instead of this unparsable log:

```
Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100
Processing by HomeController#index as HTML
  Rendered text template within layouts/application (0.0ms)
  Rendered layouts/_assets.html.erb (2.0ms)
  Rendered layouts/_top.html.erb (2.6ms)
  Rendered layouts/_about.html.erb (0.3ms)
  Rendered layouts/_google_analytics.html.erb (0.4ms)
Completed 200 OK in 79ms (Views: 78.8ms | ActiveRecord: 0.0ms)
```

We get a single line with this:

```
{"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/","time":"2017-07-18 09:35:17 -0700"}
```

Part of #20060
 2017-07-18 09:49:21 -07:00
Robert Speicher fc76ff1051 Disable Rails logging in CI test environments 
See https://jtway.co/speed-up-your-rails-test-suite-by-6-in-1-line-13fedb869ec4
 2017-07-18 12:33:15 -04:00
Bob Van Landuyt 27a6aa4f51 Move system-uploads to `-/system` 2017-07-18 15:38:11 +02:00
Rémy Coutable 66c7f51897
Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-18 13:56:36 +02:00
Jacob Schatz 901319fc69 Merge branch '34831-remove-coffee-rails-gem' into 'master' 
Remove coffee-rails gem

Closes #34831

See merge request !12715
 2017-07-17 21:18:55 +00:00
Alexandros Keramidas 6bd94f20e3 Added authentiq provider to tests and updated documentation, gem and config file. 2017-07-18 00:12:50 +03:00
Joshua Lambert 6e88631cff Fix incorrect AWS ELB metrics. 2017-07-17 00:52:37 +00:00
Douwe Maan be08202b4b Merge branch 'bjk/metric_names' into 'master' 
Update metric names to match Prometheus guidelines.

Closes #35031

See merge request !12812
 2017-07-14 18:05:18 +00:00
Mike Greiling 5f615276bf Refactor user bundle 2017-07-14 15:06:49 +00:00
Sean McGivern a5b8d4bcea Instrument Ability 2017-07-14 10:46:49 +01:00
Sean McGivern 1afdbe320e Merge branch 'fixes-for-internal-auth-disabled' into 'master' 
Fixes needed when GitLab sign-in is not enabled

See merge request !12491
 2017-07-14 08:49:36 +00: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
Pawel Chojnacki 2d0741e562 Rename ConnectionRackMiddleware to RequestsRackMiddleware. 
+ fix tests after metrics rename
 2017-07-13 00:46:17 +02:00
Yorick Peterse 655219e24a Merge branch 'sh-disabled-prepared-statements-in-test' into 'master' 
Disabled prepared statements in test

See merge request !12773
 2017-07-11 11:05:02 +00:00
Sean McGivern 25d241ae97 Merge branch '33949-remove-healthcheck-access-token' into 'master' 
Remove the need to use health check token by adding ability to whitelist hosts

Closes #33949

See merge request !12612
 2017-07-11 08:51:27 +00:00
Stan Hu f92a12c265 Disabled prepared statements in test 
Some tests may test migrations and change the types of columns. If this
happens, Rails may cache a statement that will cause PostgreSQL to fail with
the message, "cached plan must not change result type":
https://github.com/rails/rails/issues/12330

This happened in https://gitlab.com/gitlab-org/gitlab-ee/issues/2890#note_34636077.
 2017-07-10 20:38:26 -07:00
Paul Charlton cb3b4a15e6 Support multiple Redis instances based on queue type 2017-07-11 03:35:47 +00:00
DJ Mountney e643c0db35 Merge branch 'master' into 'catch-redis-address-error' 
# Conflicts:
#   lib/gitlab/current_settings.rb
 2017-07-10 21:20:52 +00:00
Marin Jankovski 97a6ec4aaa Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" 
This reverts commit 83ec509ce4, reversing
changes made to 57f0677ad8.
 2017-07-10 17:29:15 +02:00
Rémy Coutable a7d65aeaf2
Re-add Feature.register_feature_groups which is already documented 
This is a follow-up for !12362 where this was documented but the code
was removed in the last iteration. Since this can still be useful and
this is already supported by the API, I think re-adding the code was
the best course of action.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-10 15:56:23 +02:00
Douwe Maan 94e2a28684 Merge branch 'feature/user-datetime-search-api-mysql' into 'master' 
Add creation time filters to user search API for admins

Closes #29507

See merge request !12682
 2017-07-07 20:52:17 +00:00
Douwe Maan 9a708aec4b Merge branch '20628-add-oauth-implicit-grant' into 'master' 
#20628 Enable implicit flow in Gitlab as OAuth Provider

Closes #20628, #2716, and #19470

See merge request !12384
 2017-07-07 18:41:32 +00:00
Douwe Maan 426271dacb Merge branch 'dm-fix-project-path-helpers-production' into 'master' 
Include new URL helpers retroactively into includers of Gitlab::Routing

Closes #34821

See merge request !12716
 2017-07-07 18:37:04 +00:00
Douwe Maan c5e11d0405 Merge branch '34737-authentiq-oauth-feature-spec' into 'master' 
Test logging in via the Authentiq OAuth provider in a feature spec

Closes #34737

See merge request !12694
 2017-07-07 17:09:58 +00:00
James Lopez 20351c3620 move CreatedAtFilter to concerns folder 2017-07-07 19:01:49 +02:00
Douwe Maan c81928cfa7 Include new URL helpers retroactively into includers of Gitlab::Routing 2017-07-07 10:43:37 -05:00
Takuya Noguchi a789ee2d1f Remove .coffee ext files for i18n 2017-07-08 00:40:10 +09:00
Felipe Artur b5f596c3ff Native group milestones 2017-07-07 15:08:49 +00:00
Mateusz Pytel a7c571ae4d #20628 Enable implicit flow in Gitlab as OAuth Provider 
Closes #20628 by re-enabling implicit grant in Doorkeeper config. OAuth2 documentation refactored.
 2017-07-07 16:54:48 +02:00
Tim Zallmann 64e589c581 Resolve "Inconsistent location of members page between groups and projects" 2017-07-07 14:40:41 +00:00
Kamil Trzciński c0e18e8657 Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master' 
Add Group secret variables

Closes #12729

See merge request !12582
 2017-07-07 12:42:02 +00:00
Sean McGivern 5c0d8d59ff Merge branch 'gitaly-mandatory' into 'master' 
Remove option to disable Gitaly in Rails

See merge request !12677
 2017-07-07 12:30:31 +00:00
Jacob Vosmaer 78089d1153 Remove option to disable Gitaly completely 2017-07-07 12:48:34 +02:00