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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-19	6	-10/+16
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
\| \| * \| \| \| \| \| \|	Revert "Fix broken access control and refactor avatar upload"	Dmitriy Zaporozhets	2015-02-19	2	-29/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7d5f86f6cbd187e75a6ba164ad6bfd036977dd07.
\| \| * \| \| \| \| \| \|	Merge branch 'access-check-when-signed-out' into 'master'	Dmitriy Zaporozhets	2015-02-18	1	-0/+2
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix push access check when not signed in. Was causing 500 on MR, Blob, Tree pages. Fixes https://github.com/gitlabhq/gitlabhq/issues/8637 and https://github.com/gitlabhq/gitlabhq/issues/8813. See merge request !1542
\| \| \| * \| \| \| \| \| \|	Fix push access check when not signed in.	Douwe Maan	2015-02-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Improve broadcast message API	Dmitriy Zaporozhets	2015-02-18	2	-2/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Dont send 404 if no broadcast messages now because it flood gitlab-shell ↵	Dmitriy Zaporozhets	2015-02-18	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	logs with 404 errors :(
\| \| * \| \| \| \| \| \| \|	DB performance improvements to GitLab	Dmitriy Zaporozhets	2015-02-18	1	-5/+9
\| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \|	Remove Group#owner_id from API since it is not used any more	Dmitriy Zaporozhets	2015-02-17	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix broken access control and refactor avatar upload	Hannes Rosenögger	2015-02-16	2	-13/+29
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit moves the note folder from /public/uploads/note to /uploads/note and changes the uploader accordingly. Now it's no longer possible to avoid the access control by modifing the url. The Avatar upload has been refactored to use an own uploader as well to cleanly seperate the two upload types.
\| * \| \| \| \| \| \|	Upgrade to Rails 4.1.9	Vinnie Okada	2015-02-14	3	-10/+16
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
\| * \| \| \| \| \|	Allow users that signed up via OAuth to set their password in order to use ↵	Douwe Maan	2015-02-13	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Git over HTTP(S).
\| * \| \| \| \| \|	Merge branch 'clean-oauth-username' into 'master'	Dmitriy Zaporozhets	2015-02-13	1	-5/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean username acquired from OAuth/LDAP. Fixes #1967. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813 See merge request !1500
\| \| * \| \| \| \| \|	Clean username acquired from OAuth/LDAP.	Douwe Maan	2015-02-12	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1967.
\| * \| \| \| \| \| \|	Merge branch 'issues_tracker_template' into 'master'	Dmitriy Zaporozhets	2015-02-12	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues trackers template If admin defines service template, service in project will be prefilled with the template data. See merge request !1503
\| \| * \| \| \| \| \| \|	Add ExternalIssue base model to make issue referencing more robust for ↵	Marin Jankovski	2015-02-11	1	-1/+1
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	external issue trackers.
\| * \| \| \| \| \| \|	Edit group members via API	Vinnie Okada	2015-02-11	3	-10/+31
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an API endpoint to update the access level of an existing group member.
\| * \| \| \| \| \|	Merge branch 'add_label_notes' into 'master'	Dmitriy Zaporozhets	2015-02-11	2	-4/+25
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add label notes It creates system note, when someone changed labels of issue/MR. Just look at the screenshot: ![labels](https://gitlab.com/uploads/vernik91/gitlab-ce/ebbdba6bdc/labels.png) Solves this [request] (http://feedback.gitlab.com/forums/176466-general/suggestions/6623258-create-a-note-when-issue-labels-change). P.S. Thanks this [PR](https://github.com/gitlabhq/gitlabhq/pull/8237) for idea :wink:. But I need this feature as soon as possible. See merge request !331
\| \| * \| \| \| \| \|	Add labels notes	Nikita Verkhovin	2015-02-08	2	-4/+25
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add internal broadcast message API.	Douwe Maan	2015-02-07	2	-0/+12
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'mention-groups'	Dmitriy Zaporozhets	2015-02-06	1	-2/+9
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: CHANGELOG
\| \| * \| \| \| \| \|	Allow groups to be mentioned.	Douwe Maan	2015-02-05	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves #1673.
\| * \| \| \| \| \| \|	Merge branch 'api-default-order' into 'master'	Dmitriy Zaporozhets	2015-02-06	4	-60/+72
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sorting refactoring * refactor sorting logic for web UI * refactor and document ordering for API: project, issues, merge requests * explicitly define ordering in models using default_scope See merge request !1476
\| \| * \| \| \| \| \| \|	Refactor and improve sorting objects in API for projects, issues and merge ↵	Dmitriy Zaporozhets	2015-02-05	4	-58/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests
\| \| * \| \| \| \| \| \|	Explicitly define ordering in models using default_scope	Dmitriy Zaporozhets	2015-02-05	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	GitHub importer refactoring	Valery Sizov	2015-02-05	2	-10/+32
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	gitlab.com importer: refactorig	Valery Sizov	2015-02-05	2	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	code folding	Valery Sizov	2015-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	GitLab.com integration: refactoring	Valery Sizov	2015-02-05	5	-10/+30
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	GitLab.com integration: refactoring	Valery Sizov	2015-02-05	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Gitlab integration: added tests	Valery Sizov	2015-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	GitLab integration. Importer	Valery Sizov	2015-02-05	3	-0/+169
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge pull request #8395 from sbeh/master	Dmitriy Zaporozhets	2015-02-04	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Socket [::]:123 on Linux listens on IPv4 and IPv6
\| \| * \| \| \| \| \| \|	Socket [::]:123 on Linux listens on IPv4 and IPv6	sbeh	2014-11-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will ensure nginx starts up without the following errors messages: nginx: [emerg] bind() to [::]:443 failed (98: Address already in use) nginx: [emerg] bind() to [::]:443 failed (98: Address already in use) nginx: [emerg] bind() to [::]:443 failed (98: Address already in use) nginx: [emerg] bind() to [::]:443 failed (98: Address already in use) nginx: [emerg] bind() to [::]:443 failed (98: Address already in use) nginx: [emerg] still could not bind() Googling for them leads you to this site: https://chrisjean.com/2014/02/10/fix-nginx-emerg-bind-to-80-failed-98-address-already-in-use/
\| * \| \| \| \| \| \| \|	Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint	Dmitriy Zaporozhets	2015-02-04	2	-5/+27
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|	Added a way to retrieve MR files
\| \| * \| \| \| \| \| \|	Added a way to retrieve MR files	Jeroen van Baarsen	2015-02-04	2	-5/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master'	Dmitriy Zaporozhets	2015-02-04	2	-0/+18
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mwessel/gitlab ce configure protection See merge request !1467
\| \| * \| \| \| \| \| \| \|	Improve protected branches selectbox options	Dmitriy Zaporozhets	2015-02-03	1	-5/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into mwessel/gitlab-ce-configure-protection	Dmitriy Zaporozhets	2015-02-03	32	-97/+119
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Marco Wessel	2015-01-30	8	-30/+88
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure-protection Conflicts: CHANGELOG db/schema.rb
\| \| * \| \| \| \| \| \| \| \|	actually fix indentation	Marco Wessel	2015-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix indentation	Marco Wessel	2015-01-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Allow configuring protection of the default branch upon first push	Marco Wessel	2015-01-25	2	-0/+17
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Dont load rubocop in prod env	Dmitriy Zaporozhets	2015-02-03	1	-2/+4
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #8723 from jubianchi/api-groups-path	Dmitriy Zaporozhets	2015-02-03	3	-34/+23
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Access groups using path
\| \| * \| \| \| \| \| \| \| \|	Acces groups with their path in API	jubianchi	2015-02-03	3	-34/+23
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rubocop: indentation fixes Yay!!!	Dmitriy Zaporozhets	2015-02-02	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rubocop: no trailing newlines	Dmitriy Zaporozhets	2015-02-02	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rubocop: comment indentation	Dmitriy Zaporozhets	2015-02-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	More rubocop rules enable	Dmitriy Zaporozhets	2015-02-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rubocop: Style/CaseIndentation enabled	Dmitriy Zaporozhets	2015-02-02	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \|