delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Standardize on ISO8601 UTC time for logragesh-lograge-iso6801-time	Stan Hu	2017-07-20	1	-1/+1
\|
*	Merge branch 'authentiq-updates' into 'master'	Rémy Coutable	2017-07-19	1	-3/+3
\|\ \| \| \| \| \| \| \| \|	Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952
\| *	Added authentiq provider to tests and updated documentation, gem and config ↵	Alexandros Keramidas	2017-07-18	1	-3/+3
\| \| \| \| \| \| \| \|	file.
* \|	Merge branch 'bvl-free-system-namespace' into 'master'	Sean McGivern	2017-07-19	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Free `system` namespace by moving uploads into `uploads/-` Closes #33550 See merge request !12917
\| * \|	Move system-uploads to `-/system`	Bob Van Landuyt	2017-07-18	1	-2/+2
\| \| \|
* \| \|	Update Prometheus gem to version that explicitly calls `munmap`	Paweł Chojnacki	2017-07-19	2	-5/+12
\| \| \|
* \| \|	Merge branch 'rc/bump-peek-performance_bar' into 'master'	Sean McGivern	2017-07-19	1	-4/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939
\| * \| \|	Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_bar	Rémy Coutable	2017-07-18	1	-4/+0
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'sh-structured-logging' into 'master'	Sean McGivern	2017-07-19	1	-0/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add structured logging for Rails processes See merge request !12928
\| * \| \|	Add structured logging for Rails processessh-structured-logging	Stan Hu	2017-07-18	1	-0/+21
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \|	Merge branch 'rs-disable-test-log-in-ci' into 'master'	Rémy Coutable	2017-07-18	1	-0/+5
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Disable Rails logging in CI test environments See merge request !12847
\| * \|	Disable Rails logging in CI test environmentsrs-disable-test-log-in-ci	Robert Speicher	2017-07-18	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	See https://jtway.co/speed-up-your-rails-test-suite-by-6-in-1-line-13fedb869ec4
* \| \|	Merge branch '34831-remove-coffee-rails-gem' into 'master'	Jacob Schatz	2017-07-17	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove coffee-rails gem Closes #34831 See merge request !12715
\| * \| \|	Remove .coffee ext files for i18n	Takuya Noguchi	2017-07-08	1	-1/+0
\| \| \| \|
* \| \| \|	Fix incorrect AWS ELB metrics.35174-fix-aws-elb-query	Joshua Lambert	2017-07-17	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'bjk/metric_names' into 'master'	Douwe Maan	2017-07-14	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812
\| * \| \| \|	Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_names	Pawel Chojnacki	2017-07-13	1	-1/+1
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	+ fix tests after metrics rename
* \| \| \|	Refactor user bundle	Mike Greiling	2017-07-14	1	-1/+1
\| \| \| \|
* \| \| \|	Instrument Abilityinstrument-ability	Sean McGivern	2017-07-14	1	-0/+4
\| \| \| \|
* \| \| \|	Merge branch 'fixes-for-internal-auth-disabled' into 'master'	Sean McGivern	2017-07-14	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fixes needed when GitLab sign-in is not enabled See merge request !12491
\| * \| \|	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
* \| \| \|	Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'	Yorick Peterse	2017-07-11	2	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disabled prepared statements in test See merge request !12773
\| * \| \| \|	Disabled prepared statements in testsh-disabled-prepared-statements-in-test	Stan Hu	2017-07-10	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \|	Merge branch '33949-remove-healthcheck-access-token' into 'master'	Sean McGivern	2017-07-11	3	-6/+12
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
\| * \| \| \| \|	Merge prometheus unicorn sampler settigns within monitoring settings	Pawel Chojnacki	2017-07-05	3	-11/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Add spaces between test phases	Pawel Chojnacki	2017-07-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ fix wrong test setup
\| * \| \| \| \|	correctly handle transforming settings into useful datastructure	Pawel Chojnacki	2017-07-05	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Bring back healthcheck token access to monitoring resources, but mark this ↵	Pawel Chojnacki	2017-07-05	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as deprecated
\| * \| \| \| \|	Remove the need to use health check token	Pawel Chojnacki	2017-07-05	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in favor of whitelist that will be used to control the access to monitoring resources
* \| \| \| \| \|	Support multiple Redis instances based on queue type	Paul Charlton	2017-07-11	10	-23/+272
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'master' into 'catch-redis-address-error'	DJ Mountney	2017-07-10	16	-68/+254
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/current_settings.rb
\| * \| \| \|	Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"	Marin Jankovski	2017-07-10	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
\| * \| \| \|	Re-add Feature.register_feature_groups which is already documented	Rémy Coutable	2017-07-10	1	-0/+2
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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>
\| * \| \|	Merge branch 'feature/user-datetime-search-api-mysql' into 'master'	Douwe Maan	2017-07-07	1	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add creation time filters to user search API for admins Closes #29507 See merge request !12682
\| \| * \| \|	move CreatedAtFilter to concerns folder	James Lopez	2017-07-07	1	-1/+2
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch '20628-add-oauth-implicit-grant' into 'master'	Douwe Maan	2017-07-07	1	-3/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#20628 Enable implicit flow in Gitlab as OAuth Provider Closes #20628, #2716, and #19470 See merge request !12384
\| \| * \| \|	#20628 Enable implicit flow in Gitlab as OAuth Provider	Mateusz Pytel	2017-07-07	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #20628 by re-enabling implicit grant in Doorkeeper config. OAuth2 documentation refactored.
\| * \| \| \|	Merge branch 'dm-fix-project-path-helpers-production' into 'master'	Douwe Maan	2017-07-07	1	-10/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include new URL helpers retroactively into includers of Gitlab::Routing Closes #34821 See merge request !12716
\| \| * \| \| \|	Include new URL helpers retroactively into includers of Gitlab::Routingdm-fix-project-path-helpers-production	Douwe Maan	2017-07-07	1	-10/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '34737-authentiq-oauth-feature-spec' into 'master'	Douwe Maan	2017-07-07	1	-1/+4
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test logging in via the Authentiq OAuth provider in a feature spec Closes #34737 See merge request !12694
\| \| * \| \| \|	Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-spec	Timothy Andrew	2017-07-07	1	-1/+4
\| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- The `migration:path-pg` build was previously failing when the Authentiq feature spec was enabled by placing Authentiq configuration in the `test` section of `gitlab.yml` - The `migration:path-pg` task checks out an old revision of the codebase (`v8.14.10`) and runs a `schema:load`. It then checks out the commit under test, and runs `db:migrate`, to verify that migrations run without errors. - The problem here is that `v8.14.10` does not have the Authentiq module installed, but is run with the `gitlab.yml` for `master`, which would contain the `Authentiq` configuration in the `test` section. - The solution was to use the `v8.14.10` `gitlab.yml` for the `schema:load`, rather than the `gitlab.yml` from master.
\| * \| \| \|	Native group milestones	Felipe Artur	2017-07-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Resolve "Inconsistent location of members page between groups and projects"	Tim Zallmann	2017-07-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'feature/intermediate/12729-group-secret-variables' into 'master'	Kamil Trzciński	2017-07-07	1	-0/+8
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Group secret variables Closes #12729 See merge request !12582
\| \| * \| \| \|	Wrap additional routes by dash(-). And remove those routes from path_regex.rb.	Shinya Maeda	2017-07-07	1	-4/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Basic BE change	Shinya Maeda	2017-07-07	1	-0/+6
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Basic BE change Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Implement CURD Rename codes related to VariableGroup and VariableProject FE part Remove unneccesary changes Make Fe code up-to-date Add protected flag to migration file Protected group variables essential package Update schema Improve doc Fix logic and spec for models Fix logic and spec for controllers Fix logic and spec for views(pre feature) Add feature spec Fixed bugs. placeholder. reveal button. doc. Add changelog Remove unnecessary comment godfat nice catches Improve secret_variables_for arctecture Fix spec Fix StaticAnlysys & path_regex spec Revert "Improve secret_variables_for arctecture" This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1. Use ayufan suggestion for secret_variables_for Use find instead of find_by Fix spec message for variable is invalid Fix spec remove variable.group_id = group.id godffat spec nitpicks Use include Gitlab::Routing.url_helpers for presenter spec
\| * \| \| \|	Merge branch 'gitaly-mandatory' into 'master'	Sean McGivern	2017-07-07	3	-10/+3
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Remove option to disable Gitaly in Rails See merge request !12677
\| \| * \| \|	Remove option to disable Gitaly completely	Jacob Vosmaer	2017-07-07	3	-10/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix-routes-in-production-mode' into 'master'	Douwe Maan	2017-07-06	1	-1/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix shorter route helpers in production environment Closes #34741 See merge request !12675
\| \| * \| \| \|	Fix shorter route helpers in production environmentfix-routes-in-production-mode	Sean McGivern	2017-07-06	1	-1/+5
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't know exactly when Rails picks each module to use, but this seems to be used by `app` in the console (for instance, `app.project_path` would fail before, but works now).