19387 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	a5d258e233	Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master' ... Add support of multibyte characters in LDAP UID See merge request !1472	2015-10-01 14:33:18 +00:00
Dmitriy Zaporozhets	63bbe42c9c	Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'	2015-10-01 16:28:10 +02:00
Dmitriy Zaporozhets	73520b4307	Merge branch 'style-changed-files' into 'master' ... Improve UI for list of changed files * fix paddings * re-use system colors ## Before  ## After  cc @skyruler Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1484	2015-10-01 13:53:38 +00:00
Dmitriy Zaporozhets	d330046fc1	Merge branch 'fix-500-compare' into 'master' ... Fix random 500 error on compare page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Bug appeared after recent mr !1471 See merge request !1486	2015-10-01 13:53:15 +00:00
Douwe Maan	96c2e22549	Merge branch 'disable-report-button-if-already-reported' into 'master' ... Disable the "Report abuse" button if a user has already been reported Hello, I've implemented the feature request #2330. Here is what it looks like:  I hope that's an acceptable solution. cc @DouweM See merge request !1456	2015-10-01 13:17:18 +00:00
Kamil Trzciński	114853063b	Merge branch 'ci-fixes' into 'master' ... CI: Fix clone url and fix project token removal - Fixes broken CI clone url on dev.gitlab.org - Fixes regression in CI token removal /cc @vsizov @dzaporozhets See merge request !1481	2015-10-01 12:59:39 +00:00
Dmitriy Zaporozhets	4c43d846f2	Fix 500 error on compare page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 14:12:43 +02:00
Dmitriy Zaporozhets	b5654eb4e6	Merge branch 'fix-ui-bug' into 'master' ... Fix UI bug introduced in new project page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> ## Before  ## After  cc @skyruler See merge request !1483	2015-10-01 11:33:09 +00:00
Dmitriy Zaporozhets	3871498b32	Better colors for text ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 12:55:11 +02:00
Dmitriy Zaporozhets	edd4ff28a9	Improve UI for list of changed files ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 12:44:55 +02:00
Douwe Maan	e2881cb7a1	Merge branch 'flevour/gitlab-ce-fix-merge-request-textareas'	2015-10-01 12:36:47 +02:00
Douwe Maan	d8b71ed83e	Merge branch 'master' into flevour/gitlab-ce-fix-merge-request-textareas	2015-10-01 12:36:00 +02:00
Douwe Maan	41b08e4a08	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-10-01 12:34:32 +02:00
Douwe Maan	fc4f5eef99	Merge branch 'flevour/gitlab-ce-project-path-insensitive-lookup'	2015-10-01 12:34:17 +02:00
Douwe Maan	7c7b664c01	Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookup	2015-10-01 12:33:51 +02:00
Dmitriy Zaporozhets	6718f800ce	Fix UI bug introduced in new project page ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 12:19:08 +02:00
Jacob Vosmaer	8e05ee36f7	Merge branch 'migration-doc-update' into 'master' ... Added troubleshooting to migration doc @jacobvosmaer any thoughts? See merge request !1482	2015-10-01 09:55:42 +00:00
Kamil Trzcinski	0e54847339	Fix: CI token removal regression from build trace	2015-10-01 11:43:06 +02:00
Kamil Trzcinski	9d8257238e	Fix: broken git clone URL for CI runners	2015-10-01 11:42:41 +02:00
Kamil Trzcinski	bb6a39892d	Update migration documentation	2015-10-01 11:34:29 +02:00
Dmitriy Zaporozhets	6ca5a258ca	Update db schema ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 11:33:46 +02:00
Dmitriy Zaporozhets	82f1921165	Merge branch 'mr_improve_errors_handling'	2015-10-01 11:28:36 +02:00
Dmitriy Zaporozhets	58036d6847	Merge branch 'include-full-path-in-new-mr-page' into 'master' ... Include full path of source and target branch names in New Merge Request page The previous title on the New Merge Request page would only show the group name. which could be confusing. Before, if you attempted to create a new merge request within the repo, it might look like this:  Since they are in the same repo, this MR just simplifies this to the branches:  However, if you create a MR from a forked project, you now see the full namespace:  Closes #2875 See merge request !1477	2015-10-01 09:24:46 +00:00
Dmitriy Zaporozhets	26d5eaff9b	Merge branch 'project_moving' into 'master' ... Note the original location of a moved project when notifying users of the move https://dev.gitlab.org/gitlab/gitlabhq/issues/2536 See merge request !1463	2015-10-01 09:22:47 +00:00
Stan Hu	2e92600b30	Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being dropped ... Closes #2867	2015-10-01 01:46:08 -07:00
Douwe Maan	2cb7a778a0	Merge branch 'rs-disable-signin-after-reset' into 'master' ... Take advantage of `Devise.sign_in_after_reset_password` Since we've updated our Devise dependency, we can take advantage of this new-ish configuration setting and avoid our hackish workaround. See merge request !1475	2015-10-01 08:33:04 +00:00
Valery Sizov	5b57313051	Note the original location of a moved project when notifying users of the move	2015-10-01 09:54:56 +03:00
Valery Sizov	05fdd12fd9	Improve error message when merging fails	2015-10-01 09:45:47 +03:00
Stan Hu	5544d54793	Include full path of source and target branch names in New Merge Request page ... Previous title would only show the group name, which could be confusing. Closes #2875	2015-09-30 20:50:53 -07:00
Kamil Trzciński	2714d5b814	Merge branch 'update-docker' into 'master' ... Update docker guide and add docker-compose.yml /cc @JobV @sytses See merge request !1473	2015-09-30 18:43:34 +00:00
Robert Speicher	3a4274e19e	Take advantage of Devise.sign_in_after_reset_password	2015-09-30 14:35:00 -04:00
Kamil Trzcinski	f310c84b1d	Fix typo	2015-09-30 19:54:56 +02:00
Kamil Trzcinski	54452412f7	Merge branch 'merge-ci-data'	2015-09-30 19:51:34 +02:00
Robert Speicher	0bf60630c0	Merge branch 'fix-view-admin-applications-text' into 'master' ... Fixes english information paragraph in admin/applications view See merge request !1470	2015-09-30 17:50:37 +00:00
Kamil Trzcinski	5a401523eb	Fix migration	2015-09-30 19:43:29 +02:00
Diogo Resende	bbb845b20b	Adds newline at end of file	2015-09-30 17:28:06 +00:00
Diogo Resende	63a6259328	Adds missing plural form of applications of previous commit	2015-09-30 17:26:55 +00:00
Robert Speicher	2b9b20bc96	Merge branch 'apache-gghs-tcp' into 'master' ... Apache needs gitlab-git-http-server on TCP [ci skip] See merge request !1462	2015-09-30 16:17:37 +00:00
Robert Speicher	ecdee8772b	Merge branch 'golang-ruby-versions' into 'master' ... Bump Ruby and Golang versions [ci skip] See merge request !1467	2015-09-30 16:15:48 +00:00
Dmitriy Zaporozhets	048dd5e458	Merge branch 'merge-ci-data' into 'master' ... Use data stored in projects instead of ci_projects - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc. /cc @dzaporozhets See merge request !1404	2015-09-30 16:05:33 +00:00
Dmitriy Zaporozhets	247385a702	Merge branch 'fix-removed-file-in-diff' into 'master' ... Fix bug when removed file was not appearing in merge request diff Finally we can see removed files in merge request diff ✨ Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2533 See merge request !1471	2015-09-30 15:41:22 +00:00
Dmitriy Zaporozhets	1ca119930f	Merge branch 'cleanup-ci-helpers' into 'master' ... Cleanup ci helpers Part of #2594 See merge request !1466	2015-09-30 14:07:04 +00:00
Kamil Trzciński	72b496b3a0	Merge branch 'fix-clear-crontab-in-ci-migration-guide' into 'master' ... Add a missing RAILS_ENV=production to fix crontab clearing in the CI migration guide All other commands in the guide set this env var, but it's missing for the `whenever --clear-crontab` call and this causes it to not clear the crontab properly. See merge request !1474	2015-09-30 13:37:23 +00:00
Dimitar Dimitrov	f4eaae5767	Add a missing RAILS_ENV=production to crontab clearing ... All other commands in the guide set this env var, but it's missing here and this causes whenever not to clear the crontab file of gitab_ci properly.	2015-09-30 16:30:13 +03:00
Dmitriy Zaporozhets	46503b789d	Fix invalid tests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-09-30 15:29:52 +02:00
Kamil Trzcinski	f9e5a30d03	Update docker guide and add docker-compose.yml	2015-09-30 14:24:39 +02:00
Kamil Trzcinski	ad765353f6	Fix sometimes failing tests	2015-09-30 12:51:03 +02:00
Kamil Trzcinski	b9ccc79cb5	Delegate ci_project parameters to projects ... - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc.	2015-09-30 12:48:40 +02:00
Петров Роман	e82b37a653	Add support of multibyte characters in LDAP UID	2015-09-30 13:47:50 +03:00
Dmitriy Zaporozhets	fe7e97320c	Fix bug when removed file was not appearing in merge request diff ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-09-30 12:31:23 +02:00