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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'cs-fix-firefox-height' into 'master'	Annabel Dunstone Gray	2016-11-17	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix line numbers not matching up with code in Firefox. Firefox has had broken line number alignment for a while now, if this is a bug with Firefox they don't seem to want to fix it since its been there from 46 through 49. This fixes it. Before: ![Screen_Shot_2016-09-22_at_3.08.44_PM](/uploads/8bb65f40e44f738c0c375b0c8ef7dea6/Screen_Shot_2016-09-22_at_3.08.44_PM.png) After: ![Screen_Shot_2016-09-22_at_3.09.10_PM](/uploads/9e537be56886569d8a82390f2b97c42b/Screen_Shot_2016-09-22_at_3.09.10_PM.png) Fixes #20202. Safari/Chrome work the same as before, Snippets seems to work fine still as well. Page tested: http://localhost:3000/gitlab-org/gitlab-ce/blob/master/app/models/project.rb cc: @annabeldunstone See merge request !6485
\| *	Fix line numbers not matching up with code in Firefox.cs-fix-firefox-height	Connor Shea	2016-11-16	1	-2/+2
\| \|
* \|	Merge branch 'fix-singin-redirect-for-fork-new' into 'master'	Sean McGivern	2016-11-17	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing the issue of visiting a project fork url giving 500 error when not signed… Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24302 See merge request !7392
\| * \|	Add authentication for for create action. Add more tests for for new and ↵	Cagdas Gerede	2016-11-15	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|	create actions
\| * \|	Add a new line after the guard statement to be compatible with the style guide.	Cagdas Gerede	2016-11-12	1	-0/+1
\| \| \|
\| * \|	Replaces conditional with guard statement.	Cagdas Gerede	2016-11-12	1	-0/+1
\| \| \|
\| * \|	Temporary change	Cagdas Gerede	2016-11-12	1	-1/+0
\| \| \|
\| * \|	Replace conditional with a guard statement.	Cagdas Gerede	2016-11-12	1	-6/+3
\| \| \|
\| * \|	Fixing the issue of visiting a project fork url giving 500 error when not ↵	Cagdas Gerede	2016-11-10	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|	signed in instead of being redirected to the sign in page. The main reason is ApplicationController skips authentication if the project exists. To fix the issue, forced the authentication in ForksController when current_user is nil.
* \| \|	Merge branch 'feature/subscribe-to-group-level-labels' into 'master'	Sean McGivern	2016-11-17	17	-75/+261
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support subscribing to group labels https://gitlab.com/gitlab-org/gitlab-ce/issues/23586 See merge request !7215
\| * \| \|	Avoid code duplication for label subscription status on label partial	Douglas Barbosa Alexandre	2016-11-17	3	-15/+9
\| \| \| \|
\| * \| \|	Rename LabelSubscription javascript to ProjectLabelSubscription	Douglas Barbosa Alexandre	2016-11-17	2	-3/+3
\| \| \| \|
\| * \| \|	Fix label subscription menu on small screens resolution	Douglas Barbosa Alexandre	2016-11-17	3	-16/+42
\| \| \| \|
\| * \| \|	Allow users to subscribe to a group label at group or project level	Douglas Barbosa Alexandre	2016-11-17	5	-11/+122
\| \| \| \|
\| * \| \|	Use button instead of an icon to subscribe/unsubscribe to labels	Douglas Barbosa Alexandre	2016-11-17	4	-14/+49
\| \| \| \|
\| * \| \|	Add toggle_subscription action to Groups::LabelsController	Douglas Barbosa Alexandre	2016-11-17	1	-0/+7
\| \| \| \|
\| * \| \|	Allow subscriptions to be created without a project	Douglas Barbosa Alexandre	2016-11-17	2	-10/+17
\| \| \| \|
\| * \| \|	Remove default value for `project` argument on subscribable concern	Douglas Barbosa Alexandre	2016-11-17	6	-24/+22
\| \| \| \|
\| * \| \|	Use @project as default on ToggleSubscriptionAction concern	Douglas Barbosa Alexandre	2016-11-17	4	-13/+1
\| \| \| \|
\| * \| \|	Allow users to subscribe to group labels at project-level	Douglas Barbosa Alexandre	2016-11-17	3	-20/+15
\| \| \| \|
\| * \| \|	Refactoring label subscription toggle button text to accept a project	Douglas Barbosa Alexandre	2016-11-17	2	-4/+4
\| \| \| \|
\| * \| \|	Refactoring label subscription status to accept a project	Douglas Barbosa Alexandre	2016-11-17	2	-4/+4
\| \| \| \|
\| * \| \|	Refactoring notification service to find subscriptions per project	Douglas Barbosa Alexandre	2016-11-17	1	-13/+13
\| \| \| \|
\| * \| \|	Add subscribable_project to ToggleSubscriptionAction concern	Douglas Barbosa Alexandre	2016-11-17	4	-1/+17
\| \| \| \|
\| * \| \|	Refactoring Subscribable concern to accept a project	Douglas Barbosa Alexandre	2016-11-17	2	-17/+23
\| \| \| \|
\| * \| \|	Fix small typo on NotificationService	Douglas Barbosa Alexandre	2016-11-17	1	-1/+1
\| \| \| \|
\| * \| \|	Add unique index to subscriptions on subscribable and user and project	Douglas Barbosa Alexandre	2016-11-17	1	-2/+2
\| \| \| \|
\| * \| \|	Add project_id to subscriptions	Douglas Barbosa Alexandre	2016-11-17	1	-0/+3
\| \| \| \|
* \| \| \|	Merge branch 'chat-name-authorize' into 'master'	Rémy Coutable	2016-11-17	9	-0/+217
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows to authorize chat user against GitLab. This is needed for: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7438 See merge request !7450
\| * \| \| \|	Change last_used_at to use touchchat-name-authorize	Kamil Trzcinski	2016-11-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add chat_name partial	Kamil Trzcinski	2016-11-17	3	-30/+30
\| \| \| \| \|
\| * \| \| \|	Fix code review	Kamil Trzcinski	2016-11-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix code review style issues	Kamil Trzcinski	2016-11-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Improve code design after code review	Kamil Trzcinski	2016-11-16	4	-11/+13
\| \| \| \| \|
\| * \| \| \|	Fix `chat_names` before_action	Kamil Trzcinski	2016-11-16	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into chat-name-authorize	Kamil Trzcinski	2016-11-16	116	-562/+822
\| \|\ \ \ \
\| * \| \| \| \|	Add most of specs for chat names	Kamil Trzcinski	2016-11-16	3	-9/+32
\| \| \| \| \| \|
\| * \| \| \| \|	Create relation between chat user and GitLab user and allow to authorize ↵	Kamil Trzcinski	2016-11-16	8	-0/+192
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	them [ci skip]
* \| \| \| \|	Merge branch 'assignee-dropdown-autocomplete' into 'master'	Fatih Acet	2016-11-17	1	-1/+7
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include author in assignee dropdown search ## What does this MR do? Previously when you searched for the author in the assignee dropdown (if they aren't in the project) it did not actually include the author. This changes that so that when you search for the author it will correctly include the user. ## Screenshots (if relevant) ![Screen_Shot_2016-11-17_at_11.14.53](/uploads/5a13475d8ded459fd3b1ba6570897665/Screen_Shot_2016-11-17_at_11.14.53.png) ## What are the relevant issue numbers? Closes #22905 See merge request !7526
\| * \| \| \|	Include author in assignee dropdown searchassignee-dropdown-autocomplete	Phil Hughes	2016-11-17	1	-1/+7
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When searching for the author in the assignee dropdown it now correctly returns the user Closes #22905
* \| \| \|	Merge branch '23990-project-show-error-when-empty-repo' into 'master'	Douwe Maan	2016-11-17	1	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	500 error on project show when user is not logged in and project is still empty ## What does this MR do? Aims to fix the 500 error when the project is empty and the user is not logged in and tries to access project#show ## Screenshots (if relevant) When the project is empty and the user is not logged in we default to the empty project partial instead of readme. ![Screen_Shot_2016-11-11_at_22.54.21](/uploads/3d87e65195376c85d3e515e6d5a9a850/Screen_Shot_2016-11-11_at_22.54.21.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [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 #23990 See merge request !7376
\| * \| \| \|	adds fix for security issue when annonymous user does not have access to ↵23990-project-show-error-when-empty-repo	tiagonbotelho	2016-11-17	3	-62/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repository we now display the activity feed instead of the readme
\| * \| \| \|	moves empty view logic onto empty partial to make it reusable and fixes tests	tiagonbotelho	2016-11-15	2	-59/+56
\| \| \| \| \|
\| * \| \| \|	change empty project view to annonymous user from activity to empty partial	tiagonbotelho	2016-11-11	3	-5/+8
\| \| \| \| \|
\| * \| \| \|	adds guard clause for readme model method and initializes a new view with ↵	tiagonbotelho	2016-11-11	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	proper stylesheets
* \| \| \| \|	Merge branch 'jira_service_simplify' into 'master'	Sean McGivern	2016-11-17	1	-10/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JiraService: simplify url generation Fixes #24085 See merge request !7307
\| * \| \| \| \|	simplify url generation	Jarka Kadlecova	2016-11-05	1	-10/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'highlight-first-user-autocomplete-option' into 'master'	Fatih Acet	2016-11-17	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Highlight first user autocomplete option See merge request !7520
\| * \| \| \| \| \|	Highlight first user autocomplete optionhighlight-first-user-autocomplete-option	Douwe Maan	2016-11-17	1	-2/+2
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'feature/environment-teardown-when-branch-deleted' into 'master'	Kamil Trzciński	2016-11-17	6	-22/+97
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop environment when branch is deleted ## What does this MR do? This MR adds a environment teardown service, that is called when user deletes a branch. This most often happens when merge requests is merged. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #23218 See merge request !7355