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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Blob#load_all_data! doesn’t need an argumentblob-load-all-data	Douwe Maan	2017-06-07	4	-4/+4
\|
*	Added more actions and report as abuse to all notes	Luke "Jared" Bennett	2017-06-07	1	-1/+6
\|
*	Merge branch 'backport_fix_slash_commands_for_multiple_assignee' into 'master'	Douwe Maan	2017-06-07	2	-4/+10
\|\ \| \| \| \| \| \| \| \|	Backport from EE: Fix '/unassign' slash command See merge request !11926
\| *	Backport Fix '/unassign' slash commandbackport_fix_slash_commands_for_multiple_assignee	Valery Sizov	2017-06-07	2	-4/+10
\| \|
* \|	Merge branch 'fix/backup-restore-resume' into 'master'	James Lopez	2017-06-07	1	-38/+37
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix backup task to continue on corrupt repositories Closes #31767 See merge request !11962
\| * \|	fix typofix/backup-restore-resume	James Lopez	2017-06-07	1	-1/+1
\| \| \|
\| * \|	fix wiki	James Lopez	2017-06-07	1	-1/+1
\| \| \|
\| * \|	refactor code and spec	James Lopez	2017-06-07	1	-25/+21
\| \| \|
\| * \|	fix backup task to ignore errors per project	James Lopez	2017-06-07	1	-26/+29
\| \| \|
* \| \|	Merge branch 'sync-email-from-omniauth' into 'master'	Douwe Maan	2017-06-07	2	-9/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sync email address from specified omniauth provider See merge request !11268
\| * \| \|	Sync email address from specified omniauth provider	Robin Bobbitt	2017-06-07	2	-9/+21
\| \| \| \|
* \| \| \|	Merge branch 'fix-memoization-in-contributions-calendar' into 'master'	Rémy Coutable	2017-06-07	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix memoization in ContributionsCalendar#activity_dates See merge request !11973
\| * \| \|	Fix memoization in ContributionsCalendar#activity_datesfix-memoization-in-contributions-calendar	Sean McGivern	2017-06-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This doesn't appear to be actually called twice, but having it appear to work but not would be a problem if it was.
* \| \| \|	Merge branch 'fix_rubocop_warning_about_has_key' into 'master'	Grzegorz Bizon	2017-06-07	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use key? instead of has_key? See merge request !11971
\| * \| \| \|	Use key? instead of has_key? methodfix_rubocop_warning_about_has_key	Pawel Chojnacki	2017-06-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '3191-deploy-keys-update' into 'master'	Rémy Coutable	2017-06-07	1	-0/+21
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement ability to update deploy keys Closes #3191 See merge request !10383
\| * \| \| \|	Implement ability to update deploy keys	Alexander Randa	2017-06-02	1	-0/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dm-diff-file-straight-diff' into 'master'	Sean McGivern	2017-06-07	4	-18/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Diff::Position#diff_file for positions on straight diffs See merge request !11947
\| * \| \| \| \|	Fix Diff::Position#diff_file for positions on straight diffsdm-diff-file-straight-diff	Douwe Maan	2017-06-06	4	-18/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/gb/persist-pipeline-stages' into 'master'	Kamil Trzciński	2017-06-07	5	-5/+68
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persist stages in the database Closes #26481 See merge request !11790
\| * \ \ \ \ \	Merge branch 'feature/gb/migrate-pipeline-stages' into ↵	Grzegorz Bizon	2017-06-06	20	-143/+422
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: (76 commits) redesign caching of application settings Fix binary encoding error on MR diffs Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Actually clean gitlab-test path when TestEnv.set_repo_refs fails Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Resolve "When changing project visibility setting, change other dropdowns automatically" Update explanation of job-level variable override to fit example change headings to improve SEO backports changed import logic from pull mirroring feature into CE ...
\| * \| \| \| \| \|	Merge branch 'master' into feature/gb/persist-pipeline-stages	Grzegorz Bizon	2017-06-05	124	-1178/+2764
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (524 commits) Improve user experience around slash commands in instant comments Fix LFS timeouts when trying to save large files retryable? is now available for CommitStatus Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" Fix test failures Add slugify project path to CI enviroment variables Fixed typo: craeted -> created 32118 Make New environment empty state btn lowercase Expose import_status in Projects API 32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon Fix test failures Allow manual bypass of auto_sign_in_with_provider Fix keys seed Allow users to be hard-deleted from the API fixup some classnames and media queries Enable the Style/PreferredHashMethods cop Lint our factories creation in addition to their build Don’t schedule workers from inside transactions Allow scheduling from after_commit hooks Forbid Sidekiq scheduling in transactions ... Conflicts: app/serializers/pipeline_entity.rb db/schema.rb spec/factories/ci/stages.rb spec/lib/gitlab/import_export/safe_model_attributes.yml spec/services/ci/create_pipeline_service_spec.rb spec/spec_helper.rb
\| * \| \| \| \| \| \|	Export pipeline stages in import/export feature	Grzegorz Bizon	2017-06-05	2	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refine implementation of pipeline stage seeds	Grzegorz Bizon	2017-06-02	3	-68/+58
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Rename pipeline methods related to legacy stages	Grzegorz Bizon	2017-06-01	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Return stage seeds object from YAML processor	Grzegorz Bizon	2017-05-31	2	-7/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refine pipeline stages seeds class	Grzegorz Bizon	2017-05-31	3	-39/+59
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add stage seed class that represents attributes	Grzegorz Bizon	2017-05-30	2	-2/+39
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Implement CI/CD config attributes for persisted stages	Grzegorz Bizon	2017-05-30	1	-2/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'instrument-infra' into 'master'	Grzegorz Bizon	2017-06-07	6	-154/+265
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
\| * \| \| \| \| \| \| \|	Make PrometheusTextFormat return proper output terminated with '\n'	Pawel Chojnacki	2017-06-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove file dangling after rebase
\| * \| \| \| \| \| \| \|	Add missing trailing newlines	Pawel Chojnacki	2017-06-02	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix circular dependency condition with `current_application_settings`	Pawel Chojnacki	2017-06-02	1	-14/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`current_application_settings` used by `influx_metrics_enabled` executed a markdown parsing code that was measured using `Gitlab::Metrics.measure` But since the Gitlab::Metrics::InfluxDb was not yet build so Gitlab::Metrics did not yet have `measure` method. Causing the NoMethodError. However If run was successful at least once then result was cached in a file and this code never executed again. Which caused this issue to only show up in CI preparation step.
\| * \| \| \| \| \| \| \|	Split the metrics implementation to separate modules for Influx and Prometheus	Pawel Chojnacki	2017-06-02	4	-219/+235
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add prometheus text formatter	Pawel Chojnacki	2017-06-02	2	-10/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ rename controler method to #index from #metrics + remove assertion from nullMetric
\| * \| \| \| \| \| \| \|	Move Prometheus presentation logic to PrometheusText	Pawel Chojnacki	2017-06-02	3	-17/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ Use NullMetrics to mock metrics when unused + Use method_missing in NullMetrics mocking + Update prometheus gem to version that correctly uses transitive dependencies + Ensure correct folders are used in Multiprocess prometheus client tests. + rename Sessions controller's metric
\| * \| \| \| \| \| \| \|	Add tests for metrics behavior	Pawel Chojnacki	2017-06-02	1	-7/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	remove prometheus sampler	Pawel Chojnacki	2017-06-02	1	-51/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Split metrics from health controller into metrics controller	Pawel Chojnacki	2017-06-02	1	-22/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prometheus settings	Pawel Chojnacki	2017-06-02	2	-10/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Prometheus metrics first pass	Pawel Chojnacki	2017-06-02	3	-3/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	metrics wip
* \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-06-07	2	-6/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32995-issue-contents-dynamically-replaced-with-stale-version-after-saving-or-refreshing-relative-external_url-only' into 'master' Fix incorrect ETag cache key when relative instance URL is used Closes #32995 See merge request !11964
\| * \| \| \| \| \| \| \| \|	Fix incorrect ETag cache key when relative instance URL is used	Adam Niedzielski	2017-06-07	2	-6/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '12910-snippets-description' into 'master'	Phil Hughes	2017-06-07	3	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support descriptions for snippets Closes #31894 See merge request !11071
\| * \| \| \| \| \| \| \| \| \|	Support descriptions for snippets	Jarka Kadlecova	2017-05-31	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-read-registry-pat' into 'master'	Kamil Trzciński	2017-06-07	2	-7/+32
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow pulling container images using personal access tokens Closes #19219 See merge request !11845
\| * \| \| \| \| \| \| \| \| \|	Fix test failureszj-read-registry-pat	Z.J. van de Weg	2017-06-06	1	-16/+23
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Create read_registry scope with JWT auth	Z.J. van de Weg	2017-06-05	2	-14/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the first commit doing mainly 3 things: 1. create a new scope and allow users to use it 2. Have the JWTController respond correctly on this 3. Updates documentation to suggest usage of PATs There is one gotcha, there will be no support for impersonation tokens, as this seems not needed. Fixes gitlab-org/gitlab-ce#19219
* \| \| \| \| \| \| \| \| \| \|	Merge branch '2563-backport-ee1942' into 'master'	Grzegorz Bizon	2017-06-07	2	-7/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport some EE changes from adding shared_runners_minutes_limit to the API Closes gitlab-ee#2563 See merge request !11936
\| * \| \| \| \| \| \| \| \| \|	Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1942	Lin Jen-Shin	2017-06-06	2	-7/+1
\| \| \| \| \| \| \| \| \| \| \|