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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into orderable-issues	Douwe Maan	2017-03-07	1	-3/+10
\|\
\| *	Merge branch 'zj-variables-build-job' into 'master'	Kamil Trzciński	2017-03-07	1	-2/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename BUILD to JOB in CI Variables Closes #29053 See merge request !9756
\| \| *	Rename BUILD to JOB in CI Variableszj-variables-build-job	Z.J. van de Weg	2017-03-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Given GitLab moves away from using the term build, everywhere, also the CI variables are being renamed. For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same values. However, in about 3 months, support will be dropped.
\| * \|	Merge branch 'siemens/gitlab-ce-feature/openid-connect'	Sean McGivern	2017-03-07	1	-0/+6
\| \|\ \
\| \| * \|	Implement OpenID Connect identity provider	Markus Koller	2017-03-07	1	-0/+6
\| \| \|/
\| * \|	Merge remote-tracking branch ↵	Douwe Maan	2017-03-07	1	-1/+2
\| \|\ \ \| \| \|/ \| \|/\| \| \| \|	'origin/personal_access_token_api_and_impersonation_token'
\| \| *	add impersonation token	Simon Vocella	2017-02-28	1	-0/+1
\| \| \|
\| \| *	manage personal_access_tokens through api	Simon Vocella	2017-02-28	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues	Valery Sizov	2017-03-07	1	-1/+26
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-db	Douwe Maan	2017-03-06	1	-0/+11
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/models/group_spec.rb
\| \| * \	Merge branch 'zj-create-mattermost-team' into 'master'	Kamil Trzciński	2017-03-06	1	-0/+11
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create Mattermost Team from GitLab Closes #23964 See merge request !8746
\| \| \| * \	Merge branch 'master' into 'zj-create-mattermost-team'	Zeger-Jan van de Weg	2017-03-06	1	-2/+5
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| \| * \| \|	Minor edits, incorporate review	Z.J. van de Weg	2017-03-06	1	-3/+3
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'master' into zj-create-mattermost-team	Z.J. van de Weg	2017-03-02	1	-1/+1
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Improve UX	Z.J. van de Weg	2017-03-02	1	-6/+8
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'master' into zj-create-mattermost-team	Z.J. van de Weg	2017-02-24	1	-2/+4
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Fix bad merge [ci skip]	Z.J. van de Weg	2017-02-20	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge branch 'master' into zj-create-mattermost-team	Z.J. van de Weg	2017-02-20	1	-3/+2
\| \| \| \|\ \ \ \ \
\| \| \| * \| \| \| \| \|	Create MM team for GitLab group	Z.J. van de Weg	2017-02-16	1	-0/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Upload model and UploadChecksumWorker worker	Robert Speicher	2017-03-06	1	-0/+14
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'pipeline-blocking-actions' into 'master'	Kamil Trzciński	2017-03-06	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make manual actions blocking Closes #26360 and #22628 See merge request !9585
\| \| * \| \| \| \| \| \|	Migrate legacy actions in post deployment migration	Grzegorz Bizon	2017-03-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actions	Grzegorz Bizon	2017-03-06	1	-2/+5
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (26 commits) Fix UserBasic Rename `/take` to `/take_ownership`, expose `owner` in `v3`. Update after review Fix values being called at Array instead of Hash Fix json response in branches controller Improve docs and specs related to pages artifacts Add MR fo changelog about removing pages artifacts Delete artifacts for pages unless expiry date is specified Lint doc Improved team selection Move foreign key to separate migration Fix import model attributes Update documentation and expose ID Introduce tests for pipeline triggers Fix trigger model Update db/schema Make triggers to be user aware Make Pipeline Triggers to be user aware Update triggers API Remove remnants of git annex ... Conflicts: db/schema.rb
\| \| * \| \| \| \| \| \|	Add migration for manual actions with skipped status	Grzegorz Bizon	2017-03-06	1	-1/+1
\| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues	Valery Sizov	2017-03-06	1	-3/+9
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Remove unecessary defaults for uniq ip block, cleanup refactoring leftovers	Pawel Chojnacki	2017-03-06	1	-5/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	align schema.rb with upstream and fix rubocop warning about not freezing ↵	Pawel Chojnacki	2017-03-06	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mutable constants and empty error classes
\| * \| \| \| \| \| \|	Remove unecessary calls to limit_user!, UniqueIps Middleware, and address MR ↵	Pawel Chojnacki	2017-03-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Allow limiting logging in users from too many different IPs.	Pawel Chojnacki	2017-03-06	1	-1/+4
\| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Move foreign key to separate migration	Kamil Trzcinski	2017-03-05	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update db/schema	Kamil Trzcinski	2017-03-05	1	-3/+6
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues	Valery Sizov	2017-03-03	1	-3/+3
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Update occurrences of MWBS to MWPSfix/mwbs-to-mwps	James Lopez	2017-03-01	1	-3/+3
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
* \| \| \| \|	Recover db/schema.rb	Valery Sizov	2017-02-28	1	-23/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues	Valery Sizov	2017-02-27	1	-1/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Remove the default value for the `users.ghost` database column.	Timothy Andrew	2017-02-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The default (false) is not strictly required, and this lets us avoid a potentially expensive migration
\| * \| \| \|	Use a `ghost` boolean to track ghost users.	Timothy Andrew	2017-02-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rather than using a separate `ghost` state. This lets us have the benefits of both ghost and blocked users (ghost: true, state: blocked) without having to rewrite a number of queries to include cases for `state: ghost`.
* \| \| \| \|	[Issue ordering] Using integer instead of float	Valery Sizov	2017-02-27	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues	Valery Sizov	2017-02-24	1	-4/+6
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-24	1	-2/+2
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (247 commits) Switched CONTRIBUTING.md style guide recommendation for method chaining Fix new offenses Stylistic tweaks Fix OAuth/SAML user blocking behavior Revert "Enable Style/DotPosition" Revert "Prefer leading style for Style/DotPosition" Revert "Enable Style/BarePercentLiterals" Manually correct autocorrect Move up delegate calls Exclude migrations from Style/MutableConstant ActiveSupport delegation is preferred over Forwardable Update haml_lint to work with newest rubocop Add explanations to cops Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Update rubocop and rubocop-rspec and regenerate .rubocop_todo.yml Order cops alphabetically Don’t exclude some file in lib from rubocop Fix new offenses Enable Rails/Delegate Enable Style/WordArray ...
\| \| * \| \|	Merge branch '26570-optimize-latest-pipeline-query' into 'master'	Kamil Trzciński	2017-02-23	1	-2/+2
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize Ci::Pipeline.latest query Closes #26570 See merge request !9306
\| \| \| * \| \|	Add index for ci_commits for gl_project_id, ref, status26570-optimize-latest-pipeline-query	Lin Jen-Shin	2017-02-20	1	-2/+2
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	and remove the old one which we don't really need.
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-21	1	-2/+3
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (234 commits) Improve performance of User Agent Detail Fix some grammar in the API docs Remove shared example for pagination API: Use POST to (un)block a user API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Use grape validation for dates Change wording for LDAP doc that was moved to a new location API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable` Download snippets with LF line-endings by default utilize pre-minified Vue in production since no CJS distribution is available Prevent project team from being truncated too early during project destruction loading icon sometimes toggled alongside MR pipeline contents fix failed spec because haml_lint fix incorrect sidekiq concurrency count in admin background page exclude rpc_pipefs from system disc info Fix wrong line ending [ci-skip] fix overlooked window binding in spec files remove imports loader replace implicit this == window with explicit binding Todo done clicking is kind of unusable. ...
\| \| * \| \|	Improve performance of User Agent Detail	Z.J. van de Weg	2017-02-20	1	-0/+2
\| \| \|/ /
\| \| * \|	Remove comments in migration	Annabel Dunstone Gray	2017-02-16	1	-1/+1
\| \| \| \|
\| \| * \|	Fix borked db stuff	Annabel Dunstone Gray	2017-02-15	1	-2/+2
\| \| \| \|
\| \| * \|	Remove all instances of theme_id; require downtime	Annabel Dunstone Gray	2017-02-15	1	-1/+1
\| \| \| \|
\| \| * \|	Drop theme ID from users table	Annabel Dunstone Gray	2017-02-15	1	-4/+3
\| \| \|/
\| * \|	0 for unlimited, disallow blank, feedback:	Lin Jen-Shin	2017-02-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23520780
\| * \|	Update schema	Lin Jen-Shin	2017-02-16	1	-0/+1
\| \|/