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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix repo_edit_button_spec.js	Mike Greiling	2017-08-07	1	-0/+1
\|
*	fix test failures in repo_preview_spec.js	Mike Greiling	2017-08-07	1	-1/+1
\|
*	fix repo_loading_file_spec tests	Mike Greiling	2017-08-07	1	-1/+1
\|
*	use 100vh instead of flip flopping between the two - works on all suported ↵	Regis	2017-08-07	1	-3/+1
\| \| \| \|	browsers
*	fix eslint violations	Mike Greiling	2017-08-07	1	-3/+3
\|
*	increase z-index on confirmation modal	Mike Greiling	2017-08-07	1	-0/+1
\|
*	fix leaky css selector	Mike Greiling	2017-08-07	2	-2/+4
\|
*	Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide	Jacob Schatz	2017-08-07	396	-5886/+7765
\|\
\| *	fix inline javascript causing old-style repo view to break	Mike Greiling	2017-08-07	1	-6/+0
\| \|
\| *	Merge branch 'master' into ide	Mike Greiling	2017-08-07	393	-5876/+7761
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
\| \| *	Merge branch '34028-collapse-sidebar' into 'master'	Phil Hughes	2017-08-07	9	-2/+159
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Navigation - Make contextual sidebar collapsible" Closes #34028 See merge request !13281
\| \| \| *	Add changelog34028-collapse-sidebar	Annabel Dunstone Gray	2017-08-07	2	-4/+4
\| \| \| \|
\| \| \| *	Make contextual sidebar collapsible	Annabel Dunstone Gray	2017-08-07	8	-2/+159
\| \| \| \|
\| \| * \|	Merge branch 'wiki_title' into 'master'	Robert Speicher	2017-08-07	10	-55/+95
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add feature rename wiki title Closes #27800 See merge request !10069
\| \| \| * \|	Allow wiki pages to be renamed in the UI	wendy0402	2017-08-03	10	-55/+95
\| \| \| \| \|
\| \| * \| \|	Merge branch 'sh-bump-gitlab-shell-5.8.0' into 'master'	Robert Speicher	2017-08-07	1	-1/+1
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 See merge request !13344
\| \| \| * \| \|	Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14sh-bump-gitlab-shell-5.8.0	Stan Hu	2017-08-07	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'gitaly-386-shell-config' into 'master'	Robert Speicher	2017-08-07	2	-0/+3
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly needs to know where to find gitlab-shell See merge request !13306
\| \| \| * \| \| \|	fix testsgitaly-386-shell-config	Kim "BKC" Carlbäcker	2017-08-04	1	-0/+2
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Have raketask tell gitaly where to find shell	Kim "BKC" Carlbäcker	2017-08-04	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'add-star-for-action-scope' into 'master'	Rémy Coutable	2017-08-07	5	-16/+139
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add star for action scope, in order to delete image from registry Closes #26465 See merge request !13248
\| \| \| * \| \| \| \|	Rename user_can_admin? because it's more accurateadd-star-for-action-scope	Lin Jen-Shin	2017-08-07	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fix the test because we no longer have :empty_project, just use :project is the same as before
\| \| \| * \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-08-07	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into add-star-for-action-scope	Lin Jen-Shin	2017-08-07	1001	-9655/+6649
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (184 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
\| \| \| * \| \| \| \| \|	Cleanup tests and add admin_container_image to	Lin Jen-Shin	2017-08-02	3	-27/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	full_authentication_abilities. This is fine because we're going to check with can?(..) anyway
\| \| \| * \| \| \| \| \|	Implemented star auth capabilities on docker registry to enable deletion of ↵	Maxime Visonneau	2017-08-02	1	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	images
\| \| \| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into add-star-for-action-scope	Lin Jen-Shin	2017-08-02	4511	-50696/+129280
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (3161 commits) Derive project path from import URL add article to list link to CI/CD Deep Dive demo for #5800 Add code review guidelines related to Build [CI skip]. Make time span dropdown style on cycle analytics page consistent copyedit, add article to the list Make Markdown autocomplete dropdown style consistent Add 204. Remove duplicated method. Make sure we didn't commit conflicts Fix bug in blob test Always fetch branches before finding the merge base, otherwise we could find an outdated merge base Fixes dropdown margin in sidebar Fixes the search losing focus Docs add blog articles Inline script cleanup globals and easy Add option to use CommitLanguages RPC CI fixes for gitaly-ruby fix Allow logged in users to read user list under public restriction Small refactor in LegacyNamespace and moved back send_update_instructions ...
\| \| \| * \| \| \| \| \| \|	fix unit testing for admin	Jean Praloran	2017-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	fix typo and check	Jean Praloran	2017-05-30	2	-8/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	add test and rebase	Jean Praloran	2017-05-30	2	-2/+97
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	change ability requirement	Jean Praloran	2017-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	add star for action scope, in order to delete image from registry	jean	2017-05-30	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'dashboard-projects-controller-query-performance' into 'master'	Sean McGivern	2017-08-07	13	-19/+125
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve various parts of Dashboard::ProjectsController See merge request !13319
\| \| \| * \| \| \| \| \| \| \|	Eager load project creators for project dashboardsdashboard-projects-controller-query-performance	Yorick Peterse	2017-08-07	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This solves an N+1 query problem where for every project we'd query the creator separately just to figure out what avatar to display.
\| \| \| * \| \| \| \| \| \| \|	Memoize a user's personal projects count	Yorick Peterse	2017-08-07	3	-1/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The method User#projects_limit_left would run "personal_projects.count" but such a query is not memoized. As a result multiple calls to User#projects_limit_left would result in multiple COUNT() queries being executed. To work around this this commit adds User#personal_projects_count which simply memoizes the result of the COUNT() in an instance variable.
\| \| \| * \| \| \| \| \| \| \|	Remove redundant query from User#recent_push	Yorick Peterse	2017-08-07	2	-10/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "events" table has a foreign key on "events.project_id" with a cascading delete. As such it's impossible for an event to have a non-existing project ID.
\| \| \| * \| \| \| \| \| \| \|	Improve checking if projects would be returned	Yorick Peterse	2017-08-07	7	-6/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In various places we check if the same relation would return projects. This is done using "any?" which will run a COUNT query with any LIMIT/OFFSET values still applied. To work around all this we introduce 2 helper methods that take care of doing the right thing. This leads to the produced queries being simpler and fewer queries being executed.
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'bvl-nfs-circuitbreaker' into 'master'	Sean McGivern	2017-08-07	44	-41/+1482
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Circuitbreaker for storage paths Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775 See merge request !11449
\| \| \| * \| \| \| \| \| \| \| \|	Use correct `Environment`-class within `Gitlab` namespace	Bob Van Landuyt	2017-08-07	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError	Bob Van Landuyt	2017-08-07	2	-18/+19
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Use `broken_storage` in the fs_shards_spec.	Bob Van Landuyt	2017-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 'bvl-nfs-circuitbreaker'	Douwe Maan	2017-08-07	159	-4901/+2408
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
\| \| \| * \| \| \| \| \| \| \| \| \|	Use ruby's `File.stat` to check storage availability	Bob Van Landuyt	2017-08-04	2	-22/+27
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Use a Struct to keep track of failure info	Bob Van Landuyt	2017-08-04	1	-11/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Only track accessibility once	Bob Van Landuyt	2017-08-04	2	-11/+46
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Use `keys` instead of `scan_each`	Bob Van Landuyt	2017-08-04	3	-21/+13
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Move hostname to Gitlab::Environment	Bob Van Landuyt	2017-08-04	5	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Make sure the check works for paths with spaces.	Bob Van Landuyt	2017-08-04	2	-1/+23
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Add a Circuitbreaker for storage paths	Bob Van Landuyt	2017-08-04	40	-37/+1421
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'new-sidebar-context-header-hover-color' into 'master'	Annabel Dunstone Gray	2017-08-07	1	-24/+13
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed sidebar context header hover colors Closes #35999 See merge request !13323