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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Ensure GitLab CI project exists when CI service is activated manuallyensure-ci-project	Dmitriy Zaporozhets	2015-10-01	1	-0/+5
\| \| \| \| \| \| \| \|	When I check activeated checkbox in project services for GitLab CI it cause half-working state when gitlab_ci_project is missing. This patch fixes it until we have proper behaviour implemented later Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'ee_features_in_example_config' into 'master'	Dmitriy Zaporozhets	2015-10-01	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Removes reference to Enterprise Edition ssh key sync feature. fixes #2042 See merge request !1017
\| *	Removes reference to Enterprise Edition ssh key sync feature.	Ted Strzalkowski	2015-07-21	1	-1/+0
\| \|
* \|	Merge branch 'show-diff-stats-for-mr'	Dmitriy Zaporozhets	2015-10-01	5	-19/+34
\|\ \
\| * \|	Avoid unnecessary usage of local varsshow-diff-stats-for-mr	Dmitriy Zaporozhets	2015-10-01	2	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Show additions/deletions stats on merge request diff	Dmitriy Zaporozhets	2015-10-01	5	-19/+37
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'fix-email-typo' into 'master'	Dmitriy Zaporozhets	2015-10-01	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notify: fix typo in merged_merge_request_email template All (two) other templates with this line use 'url' rather than 'Url'. See merge request !1151
\| * \| \|	notify: fix typo in merged_merge_request_email template	Ben Boeckel	2015-09-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All (two) other templates with this line use 'url' rather than 'Url'.
* \| \| \|	Merge branch 'fix-visit-project-button' into 'master'	Dmitriy Zaporozhets	2015-10-01	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Visit project on GitLab button goes to The internal Gitlab project Since we are merging CI into CE, projects should go to the internal Projects page, we can also use Turbolinks to do so. In order to give the user an idea of integration, I renamed the button: "Go to Project" ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e4134716680e37b3211c3b5fd6118d1e/image.png) See merge request !1344
\| * \| \| \|	Make Visit project on GitLab button goes to The internal Gitlab project	Jeroen van Baarsen	2015-09-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we are merging CI into CE, projects should go to the internal Projects page, we can also use Turbolinks to do so. In order to give the user an idea of integration, I renamed the button: "Go to Project" Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \| \|	Add CHANGELOG item	Dmitriy Zaporozhets	2015-10-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master'	Dmitriy Zaporozhets	2015-10-01	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support of multibyte characters in LDAP UID See merge request !1472
\| * \| \| \| \|	Add support of multibyte characters in LDAP UID	Петров Роман	2015-09-30	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'	Dmitriy Zaporozhets	2015-10-01	3	-1/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being ↵	Stan Hu	2015-10-01	3	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dropped Closes #2867
* \| \| \| \| \| \|	Merge branch 'style-changed-files' into 'master'	Dmitriy Zaporozhets	2015-10-01	3	-15/+21
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve UI for list of changed files * fix paddings * re-use system colors ## Before ![Screenshot_2015-10-01_12.46.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a02fe2beb47637c664eb914dbec352c/Screenshot_2015-10-01_12.46.24.png) ## After ![Screenshot_2015-10-01_12.54.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/39b1bf78983b862b559fcc89c52d5690/Screenshot_2015-10-01_12.54.39.png) cc @skyruler Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1484
\| * \| \| \| \| \| \|	Better colors for textstyle-changed-files	Dmitriy Zaporozhets	2015-10-01	3	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Improve UI for list of changed files	Dmitriy Zaporozhets	2015-10-01	1	-12/+15
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'fix-500-compare' into 'master'	Dmitriy Zaporozhets	2015-10-01	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Fix 500 error on compare pagefix-500-compare	Dmitriy Zaporozhets	2015-10-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'disable-report-button-if-already-reported' into 'master'	Douwe Maan	2015-10-01	8	-11/+35
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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: ![report-abuse-button-disabled](https://gitlab.com/rymai/gitlab-ce/uploads/420d51906eac1c40c50701a0a340474f/report-abuse-button-disabled.png) I hope that's an acceptable solution. cc @DouweM See merge request !1456
\| * \| \| \| \| \| \| \|	Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reported	Rémy Coutable	2015-09-29	9	-67/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This simplifies the "Report button" to not use open a dropdown and adds a tooltip on this button. This also removes an extra spec and adds missing specs.
\| * \| \| \| \| \| \| \|	Disable the "Report abuse" button if a user has already been reported	Rémy Coutable	2015-09-29	7	-9/+73
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ci-fixes' into 'master'	Kamil Trzciński	2015-10-01	3	-9/+22
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \|	Fix: CI token removal regression from build traceci-fixes	Kamil Trzcinski	2015-10-01	2	-7/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix: broken git clone URL for CI runners	Kamil Trzcinski	2015-10-01	1	-2/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-ui-bug' into 'master'	Dmitriy Zaporozhets	2015-10-01	2	-42/+42
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix UI bug introduced in new project page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> ## Before ![Screenshot_2015-10-01_12.20.10](https://gitlab.com/gitlab-org/gitlab-ce/uploads/dca4598ee558e13c02e31cc1b5ecab9b/Screenshot_2015-10-01_12.20.10.png) ## After ![Screenshot_2015-10-01_12.19.56](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4a07d1f4aaa1e0cde401d9d408a9976/Screenshot_2015-10-01_12.19.56.png) cc @skyruler See merge request !1483
\| * \| \| \| \| \| \| \| \|	Fix UI bug introduced in new project pagefix-ui-bug	Dmitriy Zaporozhets	2015-10-01	2	-42/+42
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'flevour/gitlab-ce-fix-merge-request-textareas'	Douwe Maan	2015-10-01	3	-3/+6
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into flevour/gitlab-ce-fix-merge-request-textareas	Douwe Maan	2015-10-01	352	-3288/+3631
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Douwe Maan	2015-10-01	51	-590/+440
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'migration-doc-update' into 'master'	Jacob Vosmaer	2015-10-01	1	-0/+105
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added troubleshooting to migration doc @jacobvosmaer any thoughts? See merge request !1482
\| \| * \| \| \| \| \| \| \| \|	Update migration documentation	Kamil Trzcinski	2015-10-01	1	-0/+105
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update db schema	Dmitriy Zaporozhets	2015-10-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'mr_improve_errors_handling'	Dmitriy Zaporozhets	2015-10-01	7	-6/+33
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Improve error message when merging failsmr_improve_errors_handling	Valery Sizov	2015-10-01	7	-6/+33
\| \| \| \|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'include-full-path-in-new-mr-page' into 'master'	Dmitriy Zaporozhets	2015-10-01	5	-14/+49
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d300d3a362406628ffc7c8f2b5cc6b5d/image.png) Since they are in the same repo, this MR just simplifies this to the branches: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/5d7b3efc2399b37f84ccfd42bd5d6e8d/image.png) However, if you create a MR from a forked project, you now see the full namespace: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/7998c3d19e90d405f4634202cc7181c5/image.png) Closes #2875 See merge request !1477
\| \| * \| \| \| \| \| \| \| \| \|	Include full path of source and target branch names in New Merge Request page	Stan Hu	2015-09-30	5	-14/+49
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previous title would only show the group name, which could be confusing. Closes #2875
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'project_moving' into 'master'	Dmitriy Zaporozhets	2015-10-01	10	-14/+18
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \| \|	Note the original location of a moved project when notifying users of the moveproject_moving	Valery Sizov	2015-10-01	10	-14/+18
\| \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'rs-disable-signin-after-reset' into 'master'	Douwe Maan	2015-10-01	3	-45/+28
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \|	Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-reset	Robert Speicher	2015-09-30	3	-45/+28
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'update-docker' into 'master'	Kamil Trzciński	2015-09-30	8	-356/+7
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update docker guide and add docker-compose.yml /cc @JobV @sytses See merge request !1473
\| \| * \| \| \| \| \| \|	Fix typo	Kamil Trzcinski	2015-09-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Update docker guide and add docker-compose.ymlupdate-docker	Kamil Trzcinski	2015-09-30	8	-356/+7
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'merge-ci-data'	Kamil Trzcinski	2015-09-30	1	-1/+1
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Fix migrationmerge-ci-data	Kamil Trzcinski	2015-09-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'fix-view-admin-applications-text' into 'master'	Robert Speicher	2015-09-30	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes english information paragraph in admin/applications view See merge request !1470
\| \| * \| \| \| \| \| \| \|	Adds newline at end of file	Diogo Resende	2015-09-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Adds missing plural form of applications of previous commit	Diogo Resende	2015-09-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|