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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'migrate-old-artifacts' into 'master'	Grzegorz Bizon	2017-06-01	6	-35/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix data inconsistency issue for old artifacts by moving them to a currently used path Closes #32036 See merge request !11824
\| *	Add missing specs	Kamil Trzcinski	2017-06-01	5	-34/+15
\| \|
\| *	Fix data inconsistency issue for old artifacts by moving them to a currently ↵	Kamil Trzcinski	2017-06-01	5	-5/+5
\| \| \| \| \| \| \| \|	used path
* \|	Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'	Rémy Coutable	2017-06-01	1	-0/+1
\|\ \ \| \|/ \|/\| \| \| \| \|	Add missing `can_push` parameter to POST /v3/deploy_keys See merge request !11607
\| *	Add missing `can_push` parameter to POST /v3/deploy_keys	Richard Clamp	2017-05-22	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The v3 API documentation claims that `can_push` is supported when adding a deploy_key. https://gitlab.com/gitlab-org/gitlab-ce/blob/8-16-stable/doc/api/deploy_keys.md#add-deploy-key Here we make good on this promise by adding `can_push` as an optional parameter so grape can route it. This was copied from the v4 API.
* \|	Merge branch 'fix_diff_line_comments' into 'master'	Sean McGivern	2017-06-01	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802
\| * \|	Fix: A diff comment on a change at last line of a file shows as two comments ↵	Valery Sizov	2017-05-31	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|	in discussion
* \| \|	Merge branch 'dm-collapsed-blob' into 'master'	Sean McGivern	2017-06-01	9	-45/+51
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consistent diff and blob size limit names See merge request !11776
\| * \| \|	Change no_limits to limitsdm-collapsed-blob	Douwe Maan	2017-05-31	6	-11/+11
\| \| \| \|
\| * \| \|	Fix Diff#too_large? and specs	Douwe Maan	2017-05-30	1	-3/+5
\| \| \| \|
\| * \| \|	Fix Diff#to_hash and #init_from_hash	Douwe Maan	2017-05-30	1	-0/+3
\| \| \| \|
\| * \| \|	Consistent diff and blob size limit names	Douwe Maan	2017-05-29	9	-49/+50
\| \| \| \|
* \| \| \|	Merge branch 'master' into 'trigger-source'	Grzegorz Bizon	2017-05-31	19	-64/+249
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \|	Add feature toggles through Flipper	Alejandro Rodríguez	2017-05-31	5	-2/+120
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dm-gitmodules-parsing' into 'master'	Grzegorz Bizon	2017-05-31	1	-17/+30
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make .gitmodules parsing more resilient to syntax errors Closes #26009 See merge request !11803
\| \| * \| \| \|	Remove entry variabledm-gitmodules-parsing	Douwe Maan	2017-05-31	1	-10/+9
\| \| \| \| \| \|
\| \| * \| \| \|	Make .gitmodules parsing more resilient to syntax errors	Douwe Maan	2017-05-30	1	-16/+30
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	9	-41/+200
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
\| \| * \ \ \ \	Merge branch 'tc-improve-project-api-perf' into 'master'	Douwe Maan	2017-05-31	5	-39/+54
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve /project API performance Closes #31855 and #31937 See merge request !11666
\| \| \| * \| \| \| \|	Remove some deprecated methodstc-improve-project-api-perf	Toon Claes	2017-05-30	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid the use of slow queries, remove some deprecated methods and encourage the use of ProjectFinder to find projects.
\| \| \| * \| \| \| \|	Add :owned param to ProjectFinder	Toon Claes	2017-05-30	3	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And use it in the API.
\| \| \| * \| \| \| \|	Use helper to construct Finder params	Toon Claes	2017-05-30	3	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ProjectsFinder and GroupFinder both support the same set of params. And the `/api/v4/projects` and `/api/v4/group/:id/projects` also support the same set of params. But they do not match the Finder params. So use a helper method to transform them.
\| \| \| * \| \| \| \|	Use ProjectFinder to filter the projects	Toon Claes	2017-05-30	2	-13/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of trying to do the heavy lifting in the API itself, use the existing features of the ProjectFinder.
\| \| \| * \| \| \| \|	Handle `membership` in ProjectFinder	Toon Claes	2017-05-30	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ProjectFinder supports the `non_public` parameter. This can be used to find only projects the user is member of.
\| \| \| * \| \| \| \|	Build options hash after finding the list of projects	Toon Claes	2017-05-30	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because this order makes more sense and makes the code easier to read.
\| \| \| * \| \| \| \|	Move ProjectsFinder to `present_projects` for simplification	Toon Claes	2017-05-30	1	-12/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid passing parameters double, move all filtering to the `present_projects` helper.
\| \| \| * \| \| \| \|	Copy `filter_projects` helper to V3	Toon Claes	2017-05-30	1	-0/+27
\| \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The helper will be modified in V4, so copy the original to V4 to keep the current behavior in V3.
\| \| * \| \| \| \|	Merge branch '33000-tag-list-in-project-create-api' into 'master'	Rémy Coutable	2017-05-31	1	-0/+2
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tag_list param to project api Closes #33000 See merge request !11799
\| \| \| * \| \| \| \|	Add tag_list param to project api	vanadium23	2017-05-31	1	-0/+2
\| \| \| \|/ / / /
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	20	-48/+408
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
\| * \| \| \| \| \| \|	Should escape the routes because we added -	Lin Jen-Shin	2017-05-27	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use - as the prefix so we don't conflict with namespaces	Lin Jen-Shin	2017-05-26	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-26	56	-354/+1154
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
\| * \| \| \| \| \| \| \|	Routing helpers are no longer needed	Lin Jen-Shin	2017-05-24	1	-3/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add checks before redirect, remove status/trace	Lin Jen-Shin	2017-05-24	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	compatible urls, which were for javascripts
\| * \| \| \| \| \| \| \|	Use controllers to redirect	Lin Jen-Shin	2017-05-23	1	-44/+24
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Separate artifacts from builds, reusing artifacts_action_path	Lin Jen-Shin	2017-05-19	1	-16/+33
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Complete all legacy builds URL. Tests are added	Lin Jen-Shin	2017-05-19	1	-0/+44
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-18	1	-3/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
\| * \| \| \| \| \| \| \| \|	Rename BuildsController to JobsController	Lin Jen-Shin	2017-05-17	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
* \| \| \| \| \| \| \| \| \|	Introduce source to pipeline entitytrigger-source	Kamil Trzcinski	2017-05-31	2	-2/+9
\| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '30892-add-api-support-for-pipeline-schedule' into 'master'	Kamil Trzciński	2017-05-31	3	-0/+143
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API support for pipeline schedule Closes #30892 See merge request !11307
\| * \| \| \| \| \| \| \| \|	Use update_pipeline_schedule	Shinya Maeda	2017-05-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Return 202 for destory. Remove []. Remove def pipeline_schedules from helper.	Shinya Maeda	2017-05-30	1	-6/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve API with optinal and default. Allow to use scope as a parameter.	Shinya Maeda	2017-05-30	1	-3/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Use PipelineScheduleDetails	Shinya Maeda	2017-05-30	2	-11/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Improve document	Shinya Maeda	2017-05-30	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Remove deleted_at from Entity. Use find_by. Remove returns.	Shinya Maeda	2017-05-30	2	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Expose last_pipeline only when detailed status	Shinya Maeda	2017-05-30	2	-6/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Dryup fetching pipeline_schedule with helper	Shinya Maeda	2017-05-30	1	-6/+14
\| \| \| \| \| \| \| \| \| \|