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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make sure protected can't be null; Test protected!24196-protected-variables	Lin Jen-Shin	2017-06-01	2	-4/+26
\|
*	Just mention which GitLab version is required	Lin Jen-Shin	2017-06-01	1	-1/+1
\| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11688/diffs#note_31277454
*	Merge two items into one in the doc	Lin Jen-Shin	2017-06-01	1	-2/+1
\|
*	Merge branch 'master' into '24196-protected-variables'	Kamil Trzciński	2017-06-01	50	-57/+647
\|\ \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| *	Merge branch 'patch-23' into 'master'	Sid Sijbrandij	2017-05-31	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add GitLab Resources to University See merge request !11832
\| \| *	Add GitLab Resources to University	Tim Anglade	2017-05-31	1	-0/+1
\| \| \|
\| * \|	Merge branch 'trigger-source' into 'master'	Grzegorz Bizon	2017-05-31	30	-35/+116
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce source to pipeline entity See merge request !11682
\| \| * \	Merge branch 'master' into 'trigger-source'	Grzegorz Bizon	2017-05-31	182	-851/+3528
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \| \|	Introduce source to pipeline entitytrigger-source	Kamil Trzcinski	2017-05-31	30	-35/+116
\| \| \| \| \|
\| * \| \| \|	Revert "Update GITLAB_SHELL_VERSION"	Alejandro Rodríguez	2017-05-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0d55def4d3cf8f976fe09a05301afce828b95a96.
\| * \| \| \|	Update GITLAB_SHELL_VERSION	Alejandro Rodríguez	2017-05-31	1	-1/+1
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change continues with the plan to change the parameters passed around GitLab components to allow for independence of mount points. See https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/130#note_28747613
\| * \| \|	Merge branch 'feature-flags-flipper' into 'master'	Dmitriy Zaporozhets	2017-05-31	17	-5/+483
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add feature toggles through Flipper See merge request !11747
\| \| * \| \|	Add feature toggles through Flipper	Alejandro Rodríguez	2017-05-31	17	-5/+483
\| \|/ / /
\| * \| \|	Merge branch 'dm-gitmodules-parsing' into 'master'	Grzegorz Bizon	2017-05-31	3	-17/+47
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-16/+47
\| \| \| \| \|
* \| \| \| \|	Add test for Project#protected_for?	Lin Jen-Shin	2017-06-01	1	-0/+37
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 24196-protected-variables	Lin Jen-Shin	2017-06-01	176	-831/+3766
\|\ \ \ \ \ \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec 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 Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
\| * \| \| \|	Merge branch 'rename-builds-controller' into 'master'	Kamil Trzciński	2017-05-31	69	-337/+637
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename BuildsController to JobsController Closes #30699 See merge request !11407
\| \| * \| \|	Rename the other jobsrename-builds-controller	Lin Jen-Shin	2017-05-31	1	-8/+8
\| \| \| \| \|
\| \| * \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	47	-125/+1011
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| \| * \| \| \|	Update jobs_spec for changes from builds_spec	Lin Jen-Shin	2017-05-31	2	-496/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	315	-1972/+4730
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| \| * \| \| \| \|	Use another scope to add the - prefix, feedback:	Lin Jen-Shin	2017-05-31	1	-25/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11407#note_30922591
\| \| * \| \| \| \|	Update changelog to reflect the new scheme	Lin Jen-Shin	2017-05-27	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	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	11	-26/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1029	-5552/+10902
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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	4	-38/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	compatible urls, which were for javascripts
\| \| * \| \| \| \| \|	Use controllers to redirect	Lin Jen-Shin	2017-05-23	3	-44/+100
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Separate artifacts from builds, reusing artifacts_action_path	Lin Jen-Shin	2017-05-19	2	-22/+39
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Complete all legacy builds URL. Tests are added	Lin Jen-Shin	2017-05-19	6	-23/+176
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Use a single route, reducing duplication	Lin Jen-Shin	2017-05-18	1	-27/+16
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Disable rubocop hash check for blocks	Lin Jen-Shin	2017-05-18	2	-1/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix JS dispatcher for job trace	Lin Jen-Shin	2017-05-18	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add backward compatible routes for builds	Lin Jen-Shin	2017-05-18	2	-0/+576
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-05-18	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-18	66	-180/+479
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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 ...
\| \| * \| \| \| \| \| \|	Add migration to rename projects named jobs	Lin Jen-Shin	2017-05-17	2	-1/+15
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Rename BuildsController to JobsController	Lin Jen-Shin	2017-05-17	60	-182/+190
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Merge branch 'git-checkout-variable-documentation' into 'master'	Achilleas Pipinellis	2017-05-31	1	-0/+30
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Documentation for GIT_CHECKOUT variable See merge request !11748
\| \| * \| \| \| \| \| \| \|	Add Documentation for GIT_CHECKOUT variable	Jan Christophersen	2017-05-31	1	-0/+30
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'task-list-2' into 'master'	Filipa Lacerda	2017-05-31	9	-266/+19
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update task_list to version 2.0.0 Closes #22470 See merge request !11525
\| \| * \| \| \| \| \| \| \|	Include deckar01-task_list with import instead of require	Jared Deckard	2017-05-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Use native change event in the spec to trigger addEventListener	Jared Deckard	2017-05-23	2	-2/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add changelog	Jared Deckard	2017-05-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Upgrade to task_list v2	Jared Deckard	2017-05-23	6	-264/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'issue-edit-inline' into 'master'	Filipa Lacerda	2017-05-31	46	-96/+2057
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue inline editing Closes #24873 See merge request !11322
\| \| * \| \| \| \| \| \| \| \|	enable meta+enter shortcut to quick submitissue-edit-inline	Phil Hughes	2017-05-30	4	-6/+21
\| \| \| \| \| \| \| \| \| \| \|