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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	Delete deploy key from Bitbucket after importing.	Douwe Maan	2015-02-24	3	-6/+38
\| \| \| \| \|
\| * \| \| \|	Fix specs.	Douwe Maan	2015-02-24	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Load public key in initializer.	Douwe Maan	2015-02-24	2	-3/+12
\| \| \| \| \|
\| * \| \| \|	Add Bitbucket importer.	Douwe Maan	2015-02-24	9	-15/+208
\| \|/ / /
* \| \| \|	Web Editor: save to new branch	Valery Sizov	2015-02-24	2	-4/+12
\|/ / /
* \| \|	Merge branch 'api-empty-commit' into 'master'	Dmitriy Zaporozhets	2015-02-24	2	-6/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve error messages when file editing fails Give more specific errors in API responses and web UI flash messages when a file update fails. See #1479. Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push. @dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService` cc @sytse See merge request !1569
\| * \| \|	Improve error messages when file editing fails	Vinnie Okada	2015-02-22	2	-6/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Give more specific errors in API responses and web UI flash messages when a file update fails.
* \| \| \|	Fix git-over-http	Dmitriy Zaporozhets	2015-02-23	1	-0/+1
\|/ / /
* \| \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-21	5	-1/+119
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/views/projects/commits/_commit.html.haml app/views/projects/issues/_issue.html.haml app/views/projects/issues/_issue_context.html.haml app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/show/_context.html.haml
\| * \|	Merge branch 'mr-commit-comment-diff-lines' into 'master'	Dmitriy Zaporozhets	2015-02-21	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit comments on first line of diff not rendering in Merge Request Discussion view. Example can be seen near the bottom on this MR: !1533. Before: ![Screen Shot 2015-02-20 at 10.24.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/35600b98b5/Screen_Shot_2015-02-20_at_10.24.34.png) After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449) is actually rendered. See merge request !1552
\| \| * \|	Fix commit comments on first line of diff not rendering in Merge Request ↵	Douwe Maan	2015-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussion view.
\| * \| \|	Merge branch 'upload-xss-access-control' into 'master'	Marin Jankovski	2015-02-20	1	-0/+13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note attachments XSS and access control Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032. @marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged? See merge request !1553
\| \| * \| \|	Satisfy Rubocop.	Douwe Maan	2015-02-20	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Use modified ActionDispatch::Static to let uploads go through to routes.	Douwe Maan	2015-02-20	1	-0/+13
\| \| \|/ /
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-02-20	2	-0/+102
\| \|\ \ \
\| \| * \| \|	Add gitorious.org importer	Marcin Kulik	2015-02-20	2	-0/+102
\| \| \|/ /
\| * \| \|	Extend project web hooks with more data	Dmitriy Zaporozhets	2015-02-20	1	-0/+3
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add git_http_url and git_ssh_url to project web hook * add visibility_level to project web hook * add documentation about project visibility_level in API
* \| \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-19	2	-5/+11
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	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
\| \| \| \|
\| * \| \|	DB performance improvements to GitLab	Dmitriy Zaporozhets	2015-02-18	1	-5/+9
\| \|/ /
* \| \|	Upgrade to Rails 4.1.9	Vinnie Okada	2015-02-14	2	-9/+14
\|/ / \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Add ExternalIssue base model to make issue referencing more robust for ↵	Marin Jankovski	2015-02-11	1	-1/+1
\|/ / \| \| \| \| \| \|	external issue trackers.
* \|	Add labels notes	Nikita Verkhovin	2015-02-08	2	-4/+25
\| \|
* \|	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.
* \| \|	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
\|/ /
* \|	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	16	-39/+47
\|\ \
\| * \|	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
\| \| \|
\| * \|	Rubocop: Style/AlignHash enabled	Dmitriy Zaporozhets	2015-02-02	1	-2/+4
\| \| \|
\| * \|	Rubocop: Style/AlignArray enabled	Dmitriy Zaporozhets	2015-02-02	1	-1/+1
\| \| \|
\| * \|	Rubocop enabled for: Use spaces inside hash literal braces	Dmitriy Zaporozhets	2015-02-02	9	-20/+20
\| \| \|
\| * \|	Convert hashes to ruby 1.9 style	Dmitriy Zaporozhets	2015-02-02	1	-4/+4
\| \| \|
\| * \|	Improve contribution calendar on user page	Dmitriy Zaporozhets	2015-01-29	1	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* cache user contributions for day * ignore forks in calendar contribtuions
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Marco Wessel	2015-01-30	6	-14/+59
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	configure-protection Conflicts: CHANGELOG db/schema.rb
\| * \|	Improvements to LDAP::User model	Dmitriy Zaporozhets	2015-01-29	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* method #changed? also tracks changes of identites (fixes issue with email mapping) * find ldap identity before initialize one
\| * \|	Make sure we dont have exception on date parsing	Dmitriy Zaporozhets	2015-01-29	1	-2/+2
\| \| \|
\| * \|	Cleanup and make contribution calendar faster	Dmitriy Zaporozhets	2015-01-29	1	-59/+13
\| \| \|