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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove accidental EE additions in CEjej/fix-accidental-ee-directory	James Edwards-Jones	2018-05-10	2	-51/+0
\|
*	Backport with_forgery_protection spec helper	James Edwards-Jones	2018-05-08	1	-5/+12
\|
*	Merge branch 'dm-warden-hook-scope' into 'master'	Grzegorz Bizon	2018-05-07	1	-5/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Only run session related Warden hooks for user scope Closes gitlab-ee#5857 See merge request gitlab-org/gitlab-ce!18771
\| *	Only run session related Warden hooks for user scope	Douwe Maan	2018-05-07	1	-5/+5
\| \|
* \|	Merge branch '44427-state-management-with-vuex' into 'master'	Tim Zallmann	2018-05-07	3	-249/+390
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Vuex actions - How to achieve a better state management" Closes #44427 See merge request gitlab-org/gitlab-ce!17929
\| * \|	Follow up after review	Filipa Lacerda	2018-05-07	2	-1/+18
\| \| \|
\| * \|	Merge branch 'master' into 44427-state-management-with-vuext	Filipa Lacerda	2018-05-04	2198	-30639/+75637
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (1063 commits) Replace commits spinach tests with RSpec analog Update repository.rb Add note about rebase/squash duplication in Gitaly Resolve "Reconcile project templates with Auto DevOps" Move import project pane to a separate partial Inform the user when there are no project import options available Clarify location of Vue templates Make add_index_to_namespaces_runners_token migration reversible Fix lambda arguments in Grape entities Update grape-entity 0.6.0 -> 0.7.1 Fix constants in backfill_runner_type_for_ci_runners_post_migrate.rb Use limited_counter_with_delimiter in the admin user list tabs Remove a warning from spec/features/admin/admin_users_spec.rb Use smallint for runner_type since its an enum Dont remove duplicates in Runner.owned_or_shared since its not necessary Change the docs license to CC BY-SA Remove unnecessary disable transaction in add_ci_runner_namespaces Split migration to add and index namespaces.runners_token Output some useful information when running the rails console Revert "Use factory in specs for ProjectCiCdSettings" ...
\| * \| \|	Update vuex.md	Filipa Lacerda	2018-04-06	1	-5/+6
\| \| \| \|
\| * \| \|	Changes after review	Filipa Lacerda	2018-04-04	1	-32/+33
\| \| \| \|
\| * \| \|	[ci skip] Merge branch 'master' into 44427-state-management-with-vuex	Filipa Lacerda	2018-04-04	1224	-9785/+25292
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (544 commits) Bulk deleting refs is handled by Gitaly by default Allow assigning and filtering issuables by ancestor group labels Fix links to subdirectories of a directory with a plus character in its path Add banzai filter to detect commit message trailers and properly link the users Render MR commit SHA instead "diffs" when viable Fix a transient failure by removing unneeded expectations Revert changelog entry for removed feature Revert "Allow CI/CD Jobs being grouped on version strings" Add support for Sidekiq JSON logging Resolve "Protected branches count is wrong when a wildcard includes several protected branches" Remove unused form for admin application settings Use standard codequality job Resolve "Allow the configuration of a project's merge method via the API" Move the rest of application settings to expandable blocks [Rails5] Rename `sort` methods to `sort_by_attribute` Add better LDAP connection handling Updated components to PascalCase Handle invalid params when trying update_username Move network related app settings to expandable blocks [Rails5] Update Gemfile.rails5.lock [ci skip] ...
\| * \| \| \|	Fixes typos and adds mutations examples44427-state-management-with-vuex	Filipa Lacerda	2018-03-22	2	-19/+117
\| \| \| \| \|
\| * \| \| \|	Improve state management documentation	Filipa Lacerda	2018-03-22	2	-248/+275
\| \| \| \| \|
* \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into 'master'	Filipa Lacerda	2018-05-07	67	-1406/+1851
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve Web IDE left panel and modes" Closes #44846 See merge request gitlab-org/gitlab-ce!18581
\| * \| \| \| \|	fixed stageAllChanges test	Phil Hughes	2018-05-06	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fixed file action spec	Phil Hughes	2018-05-06	1	-2/+8
\| \| \| \| \| \|
\| * \| \| \| \|	added tooltip to bar buttons	Phil Hughes	2018-05-06	1	-2/+23
\| \| \| \| \| \|
\| * \| \| \| \|	fixed mis-aligned icon	Phil Hughes	2018-05-04	4	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hide success message when staging files improve action button hover
\| * \| \| \| \|	Merge branch 'ide-sidebar-commit-box' into ↵	Filipa Lacerda	2018-05-04	23	-300/+618
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44846-improve-web-ide-left-panel-and-modes' Updated commit section in IDE sidebar See merge request gitlab-org/gitlab-ce!18616
\| \| * \ \ \ \	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-04	12	-79/+160
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-commit-box
\| * \| \| \| \| \|	Merge branch 'ide-sidebar-merge-request' into ↵	Filipa Lacerda	2018-05-04	12	-80/+165
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44846-improve-web-ide-left-panel-and-modes' Added merge request review to IDE sidebar See merge request gitlab-org/gitlab-ce!18709
\| \| * \ \ \ \ \	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-04	84	-353/+1507
\| \| \|\ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-merge-request
\| \| * \| \| \| \| \|	create constant for viewer type	Phil Hughes	2018-05-04	7	-18/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n
\| \| * \| \| \| \| \|	added specs	Phil Hughes	2018-05-04	4	-1/+73
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	long branch names no longer wrap
\| \| * \| \| \| \| \|	fixed specs	Phil Hughes	2018-05-03	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-03	4	-8/+3
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-merge-request
\| \| * \| \| \| \| \| \|	updated styling	Phil Hughes	2018-05-03	4	-12/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed merge request text not always appearing
\| \| * \| \| \| \| \| \|	Added merge request to IDE sidebar	Phil Hughes	2018-05-03	3	-68/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#44846
\| \| \| \| * \| \| \| \|	fixed disabled action sticking around too long	Phil Hughes	2018-05-04	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed form collapsing too soon
\| \| \| \| * \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-04	2	-36/+30
\| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-commit-box
\| * \| \| \| \| \| \| \|	fixed duplicated tests	Phil Hughes	2018-05-04	1	-31/+29
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	removed conflict markers	Phil Hughes	2018-05-04	1	-5/+1
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-04	85	-334/+1494
\| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-commit-box
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes	Phil Hughes	2018-05-04	84	-333/+1493
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	improve logic of success message	Phil Hughes	2018-05-04	5	-12/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	instead of taking over whole sidebar, it now just shows over the commit box after 5 seconds the commit box goes back to its compact logic
\| \| \| \| * \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-03	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-commit-box
\| * \| \| \| \| \| \| \|	fixed specs	Phil Hughes	2018-05-03	4	-8/+3
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed review mode not being editable
\| \| \| * \| \| \| \|	improved success message after commit with new sidebar	Phil Hughes	2018-05-03	9	-38/+54
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-03	301	-5256/+10136
\| \| \| \|\ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-commit-box
\| * \| \| \| \| \| \|	Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes	Phil Hughes	2018-05-03	300	-5259/+10138
\| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \|	removed unused computed prop	Phil Hughes	2018-05-03	4	-26/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove object.assign instead directly assign to state created new constants
\| \| \| \| * \| \| \| \|	fixed incorrect computed prop being used	Phil Hughes	2018-05-03	3	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reduced duplicated CSS
\| \| \| \| * \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-05-03	23	-167/+368
\| \| \| \| \|\ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-sidebar-commit-box
\| * \| \| \| \| \| \| \|	Merge branch 'ide-activity-bar-review-mode' into ↵	Filipa Lacerda	2018-05-02	23	-166/+367
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'44846-improve-web-ide-left-panel-and-modes' Added review mode to new IDE sidebar See merge request gitlab-org/gitlab-ce!18501
\| \| * \| \| \| \| \| \| \|	fixed repo_editor_spec	Phil Hughes	2018-05-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	made path prop in dropdown optional	Phil Hughes	2018-05-02	5	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added computed prop for showing loading indicator
\| \| * \| \| \| \| \| \| \|	fixed height changing when hiding tabs	Phil Hughes	2018-05-02	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	changed which element is hidden	Phil Hughes	2018-05-01	2	-6/+48
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	hide edit/preview tabs in review & commit mode	Phil Hughes	2018-05-01	5	-15/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	only make diff mode editable in review mode
\| \| * \| \| \| \| \| \| \|	fixed karma & eslint	Phil Hughes	2018-04-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '44846-improve-web-ide-left-panel-and-modes' into ↵	Phil Hughes	2018-04-30	30	-71/+438
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ide-activity-bar-review-mode