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

	Commit message (Collapse)	Author	Age	Files	Lines
*	changelog entry file added24413-show-unconfirmed-email-status	Nur Rony	2016-11-21	1	-0/+4
\|
*	showing unconfirmed email status in profile	Nur Rony	2016-11-21	1	-1/+0
\|
*	Merge branch 'super-secret-login-upgrade' into 'master'	Fatih Acet	2016-11-19	2	-25/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert signin tab order fix. The history: > 1. @sytses created this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23279 > 2. The fix was submitted here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 > 3. I [made](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867#note_16993324) the same observation you did after it was merged 4. A long discussion about accessibility and UX followed, and we decided to revert all changes (https://gitlab.com/gitlab-org/gitlab-ce/issues/23698). ## Screenshots (if relevant) ![2016-11-17_20.55.22](/uploads/c81b0bbe0cd08747124531778af6273f/2016-11-17_20.55.22.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23698 See merge request !7538
\| *	Un-un-revert signin tab order fix.super-secret-login-upgrade	Bryce Johnson	2016-11-18	2	-25/+2
\| \|
* \|	Merge branch 'fix-db-schema' into 'master'	Kamil Trzciński	2016-11-19	1	-3/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate sidekiq throttling parameters Improves `db/schema` after merging https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7015. cc @grzesiek @filipa See merge request !7603
\| * \|	Remove duplicate sidekiq throttling parametersfix-db-schema	Kamil Trzcinski	2016-11-19	1	-3/+0
\|/ /
* \|	Merge branch 'fix-typo-in-gitlab-flow' into 'master'	Achilleas Pipinellis	2016-11-19	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix a typo in gitlab_flow.md ('munch'->'much') See merge request !7595
\| * \|	fix typo in gitlab_flow.md ('munch'->'much')	kkkkkkkk	2016-11-19	1	-1/+1
\| \| \|
* \| \|	Merge branch 'patch-7' into 'master'	Achilleas Pipinellis	2016-11-19	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong link Not a big one, just fix a wrong link to internal page. See merge request !7597
\| * \| \|	Fix wrong link	ebuildy	2016-11-19	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master'	Jacob Schatz	2016-11-19	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken merge request widget spec ## What does this MR do? Converts the invalid es6 syntax of the merge_request_widget_spec which is actually causing the spec not to run through teaspoon ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Get specs working again ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24673 See merge request !7594
\| * \| \| \|	Fix spec24673-broken-test-in-merge_request_widget_spec-js	Clement Ho	2016-11-18	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '22539-display-folders' into 'master'	Fatih Acet	2016-11-19	43	-329/+2349
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22539 See merge request !7015
\| * \| \| \|	Fix test22539-display-folders	Filipa Lacerda	2016-11-19	1	-22/+11
\| \| \| \| \|
\| * \| \| \|	Fix broken test	Filipa Lacerda	2016-11-19	2	-7/+22
\| \| \| \| \|
\| * \| \| \|	Changes for stop url to path	Filipa Lacerda	2016-11-19	2	-23/+1
\| \| \| \| \|
\| * \| \| \|	Try to fix tests	Kamil Trzcinski	2016-11-18	1	-4/+5
\| \| \| \| \|
\| * \| \| \|	Expose stop_path for environment to not construct that in frontend	Kamil Trzcinski	2016-11-18	3	-2/+9
\| \| \| \| \|
\| * \| \| \|	Bring back the `commit_url` as it's used by CycleAnalytics	Kamil Trzcinski	2016-11-18	2	-0/+11
\| \| \| \| \|
\| * \| \| \|	Fix broken tests	Filipa Lacerda	2016-11-18	2	-11/+11
\| \| \| \| \|
\| * \| \| \|	Do not trigger CI [ci skip]	Kamil Trzcinski	2016-11-18	0	-0/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ↵	Kamil Trzcinski	2016-11-18	20	-359/+326
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	22539-display-folders
\| \| * \| \| \|	Fix css class	Filipa Lacerda	2016-11-18	2	-2/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Remove comment from html	Filipa Lacerda	2016-11-18	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Removes unnecessary comments	Filipa Lacerda	2016-11-18	2	-3/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Improvements after review	Filipa Lacerda	2016-11-18	1	-9/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Remove unused CSS	Filipa Lacerda	2016-11-18	1	-4/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Remove slots	Filipa Lacerda	2016-11-18	2	-20/+22
\| \| \| \| \| \|
\| \| * \| \| \|	Fixes typo	Filipa Lacerda	2016-11-18	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes unneeded comparision
\| \| * \| \| \|	Try to use slots	Filipa Lacerda	2016-11-18	3	-24/+29
\| \| \| \| \| \|
\| \| * \| \| \|	Improve after review	Filipa Lacerda	2016-11-18	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Improvements after review	Filipa Lacerda	2016-11-17	1	-13/+41
\| \| \| \| \| \|
\| \| * \| \| \|	Adds helper to verify empty object	Filipa Lacerda	2016-11-17	1	-3/+18
\| \| \| \| \| \|
\| \| * \| \| \|	Fix after review	Filipa Lacerda	2016-11-17	1	-4/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Swaps url for paths in mock data	Filipa Lacerda	2016-11-17	1	-11/+10
\| \| \| \| \| \|
\| \| * \| \| \|	Fix Rubocop offense for lines in environment specs	Grzegorz Bizon	2016-11-17	1	-1/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into 22539-display-folders	Grzegorz Bizon	2016-11-17	46	-227/+754
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (26 commits) Remove extra subscribable_type filter on migration Add feature spec for labels subscription Avoid code duplication for label subscription status on label partial Rename LabelSubscription javascript to ProjectLabelSubscription Fix label subscription menu on small screens resolution Allow users to subscribe to a group label at group or project level Use button instead of an icon to subscribe/unsubscribe to labels Add CHANGELOG entry Add toggle_subscription action to Groups::LabelsController Allow subscriptions to be created without a project Use subqueries instead of joins to migrate subscriptions Add helper method to toggle label subscription on labels controller spec Remove default value for `project` argument on subscribable concern Use @project as default on ToggleSubscriptionAction concern Allow users to subscribe to group labels at project-level Pass project to Entities::Label to check if user is subscribed Fix specs to pass a project when creating subscriptions Refactoring label subscription toggle button text to accept a project Refactoring label subscription status to accept a project Refactoring notification service to find subscriptions per project ...
\| \| * \ \ \ \	Merge branch 'master' into 22539-display-folders	Grzegorz Bizon	2016-11-17	339	-1244/+4559
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (154 commits) Fix typos Fix wrong changelog item Add missing item for 8.13.6 Change last_used_at to use touch Add chat_name partial Mention Git strategy none Fix code review adds fix for security issue when annonymous user does not ... Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README ... Conflicts: spec/features/environments_spec.rb
\| \| * \| \| \| \| \|	Adds fixed layout to prevent the columns from jumping when opening a folder	Filipa Lacerda	2016-11-17	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Undo last commit	Filipa Lacerda	2016-11-17	1	-236/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Adds fixed layout to prevent the columns from jumping when opening a folder	Filipa Lacerda	2016-11-17	1	-0/+236
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix broken button in empty state	Filipa Lacerda	2016-11-17	1	-8/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	inline conditions	Filipa Lacerda	2016-11-17	1	-4/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Changes url to path	Filipa Lacerda	2016-11-17	2	-10/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix iife	Filipa Lacerda	2016-11-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix spaces	Filipa Lacerda	2016-11-17	1	-3/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Improves variable	Filipa Lacerda	2016-11-17	1	-9/+9
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Adds documentation to filter function	Filipa Lacerda	2016-11-17	1	-6/+27
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix rel attribute	Filipa Lacerda	2016-11-17	2	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix test case for environments related to deployments	Grzegorz Bizon	2016-11-17	1	-7/+14
\| \| \| \| \| \| \| \|