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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '6073_project_api' into 'master'	Sean McGivern	2017-02-28	2	-2/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API project create: Make name or path required Closes #6073 See merge request !9416
\| *	API project create: Make name or path required	Jarka Kadlecova	2017-02-27	2	-2/+4
\| \|
* \|	New runner API returns 204api-empty-return	Robert Schilling	2017-02-28	1	-1/+1
\| \|
* \|	Backport new behavior to CI API	Robert Schilling	2017-02-28	2	-0/+3
\| \|
* \|	Backport API to V3	Robert Schilling	2017-02-28	21	-3/+958
\| \|
* \|	Return 204 for delete endpoints	Robert Schilling	2017-02-28	19	-63/+22
\| \|
* \|	Merge branch '20890-comment-image-inline' into 'master' 28711-cherry-picking-ui-regressions-8-17-0	Robert Speicher	2017-02-27	1	-8/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inline comment images by removing wrapper #20890 Closes #20890 See merge request !5804
\| * \|	Fix inline comment images by removing wrapper #20890	Jared Deckard	2016-08-13	1	-8/+1
\| \| \|
* \| \|	Merge branch 'fix-webpack-dev-server-proxy' into 'master'	Douwe Maan	2017-02-27	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken dev environment in master See merge request !9557
\| * \| \|	fix missing @ symbol	Mike Greiling	2017-02-27	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-webpack-dev-server-proxy' into 'master'	Douwe Maan	2017-02-27	1	-6/+6
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Fix webpack dev server when behind proxy See merge request !9543
\| * \| \|	ensure webpack dev server proxy connects regardless of request headersfix-webpack-dev-server-proxy	Mike Greiling	2017-02-27	1	-6/+6
\| \| \| \|
* \| \| \|	Merge branch 'mock-ci-service' into 'master'	Douwe Maan	2017-02-27	1	-1/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Mock CI service/integration See merge request !9250
\| * \| \| \|	Add MockCiService integrationmock-ci-service	Eric Eastwood	2017-02-24	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9250/ See https://gitlab.com/madlittlemods/gl-mock-ci-service
* \| \| \| \|	Merge branch 'unified-member-api-response' into 'master'	Sean McGivern	2017-02-27	1	-7/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Return 400 for all validation erros in the mebers API See merge request !9523
\| * \| \| \| \|	API: Return 400 for all validation erros in the mebers APIunified-member-api-response	Robert Schilling	2017-02-24	1	-7/+0
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'feature/runners-v4-api' into 'master'	Kamil Trzciński	2017-02-27	4	-0/+80
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Runner registration/deletion API See merge request !9246
\| * \| \| \|	Rename API::Ci to API::Runnerfeature/runners-v4-api	Tomasz Maczukin	2017-02-16	3	-6/+6
\| \| \| \| \|
\| * \| \| \|	Fix rubocop offenses	Tomasz Maczukin	2017-02-16	1	-4/+3
\| \| \| \| \|
\| * \| \| \|	Add Runner registration/deletion API	Tomasz Maczukin	2017-02-16	4	-0/+81
\| \| \| \| \|
* \| \| \| \|	Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master'	Robert Speicher	2017-02-25	1	-18/+24
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Git history follow renames again by performing the --skip in Ruby Closes #23062 See merge request !9314
\| * \| \| \|	Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs23062-allow-git-log-to-accept-follow-and-skip	Rémy Coutable	2017-02-23	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Make Git history follow renames again by performing the --skip in Ruby	Rémy Coutable	2017-02-23	1	-9/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This hack is needed because of an issue when --follow and --skip are passed to git log at the same time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/23062 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Raise error when no content is provided	Douwe Maan	2017-02-24	1	-2/+0
\| \| \| \| \|
* \| \| \| \|	Address review	Douwe Maan	2017-02-24	1	-15/+21
\| \| \| \| \|
* \| \| \| \|	Update API v3 in line with v4	Douwe Maan	2017-02-24	1	-7/+0
\| \| \| \| \|
* \| \| \| \|	Fix new offenses	Douwe Maan	2017-02-24	1	-3/+1
\| \| \| \| \|
* \| \| \| \|	Consistently create, update, and delete files, taking CRLF settings into account	Douwe Maan	2017-02-24	4	-215/+124
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'dm-more-namespace-full-path' into 'master'	Sean McGivern	2017-02-24	2	-6/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Namespace#full_path instead of #path where appropriate See merge request !9495
\| * \| \| \|	Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-path	Douwe Maan	2017-02-23	2	-6/+7
\| \|/ / /
* \| \| \|	Merge branch 'api-simplify-variables-validation' into 'master'	Rémy Coutable	2017-02-24	1	-8/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify variables validation in triggers API See merge request !9506
\| * \| \| \|	Simplyfy variables validation in triggers APIapi-simplify-variables-validation	Robert Schilling	2017-02-24	1	-8/+3
\| \|/ / /
* \| \| \|	Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groups	Sean McGivern	2017-02-24	7	-4/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/api/v3_to_v4.md
\| * \ \ \	Merge branch '3874-correctly-return-json-on-delete-responses' into 'master'	Sean McGivern	2017-02-24	4	-1/+14
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return 202 with JSON body on async removals on V4 API Closes #3874 See merge request !9449
\| \| * \| \| \|	Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responses	Oswaldo	2017-02-23	4	-1/+14
\| \| \|/ / /
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-24	136	-517/+1218
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-21	7	-47/+93
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (26 commits) Allow searching issues for strings containing colons Fix Spinach failure [ci skip] UX Guide: Add personas Reuse User#find_by_any_email on UserFormatter#find_by_email Use leading periods on UserFormatter#find_by_external_uid Add CHANGELOG entry Add a simple cache for Gitlab::GithubImport::Client#user GitHub Importer - Find users based on their email address Don't use potentially slow ForkService in spec Added support for Authentiq Back-Channel Logout Added documentation for permalinks to most recent build artifacts Unify issues search behavior by always filtering when ALL labels matches Update GitLab Pages to v0.3.1 Document Timecop usage for time-sensitive tests Add process for requesting approval for licenses Rename karma job to rake karma Update positioning of nav scroll arrows Fix issue where files on a fork could not be edited Move tanuki to left of title; increase max-width of title Refactor project stats & last_commit CSS; left align main nav items ...
\| * \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-21	52	-235/+536
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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. ...
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into ↵	Lin Jen-Shin	2017-02-16	12	-30/+51
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	27762-add-default-artifacts-expiration * upstream/master: (37 commits) Show merge errors in merge request widget Clarify that stage is needed to stop environments Fix broken link in university docs allow clicking on text or icon to trigger expand style links on system notes to look clickable Clean up terms used for issues. Use New instead of Add. Fix most of broken docs links Set `Auto-Submitted: auto-generated` header to emails Fix Rubocop offense Fix regression where cmd-click stopped working for todos and merge request tabs Remove changelog entries for 8.16.5 release Merge branch 'fix-github-import-MR-wrong-project' into 'security' Merge branch 'svg-xss-fix' into 'security' Merge branch 'fix-rdoc-xss' into 'security' Merge branch 'asciidoctor-xss-patch' into 'security' Specify that only project owners can transfer a project only load istanbul plugin in development mode Make Karma output look nicer for CI (!9165) Centers loading icon vertically and horizontally in pipelines table in commit view Rename builds to jobs in docs ...
\| * \| \| \| \| \| \|	Fix tests and disallow 0 to make it consistent with .gitlab-ci.yml	Lin Jen-Shin	2017-02-15	2	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	rubocop: Align the operands of an expression	Lin Jen-Shin	2017-02-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	C: Style/MultilineOperationIndentation: Align the operands of an expression in an assignment spanning multiple lines.
\| * \| \| \| \| \| \|	Use the same syntax for default expiration	Lin Jen-Shin	2017-02-15	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23343951 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9219#note_23344036 * https://gitlab.com/gitlab-org/gitlab-ce/issues/27762#note_23344797
\| * \| \| \| \| \| \|	Initial implementation for default artifacts expiration	Lin Jen-Shin	2017-02-15	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TODO: Add tests and screenshots
* \| \| \| \| \| \| \|	Backport groups API to V3	Robert Schilling	2017-02-24	2	-0/+39
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	API: Use parameter to get owned groups instead of dedicated endpoint	Robert Schilling	2017-02-24	1	-12/+4
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-meer-blauw-op-straat' into 'master'	Robert Speicher	2017-02-23	109	-417/+432
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable (and disable) more RuboCops See merge request !9432
\| * \| \| \| \| \| \|	Fix new offensesdm-meer-blauw-op-straat	Douwe Maan	2017-02-23	1	-2/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Stylistic tweaks	Douwe Maan	2017-02-23	6	-21/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix OAuth/SAML user blocking behavior	Douwe Maan	2017-02-23	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert "Enable Style/DotPosition"	Douwe Maan	2017-02-23	18	-73/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb