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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Wrong access level badge on MR commentsaccess_level_badge_bug	Valery Sizov	2015-10-02	4	-3/+20
\|
*	Merge branch 'migration-doc-fix' into 'master'	Jacob Vosmaer	2015-10-02	1	-1/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Back and forth permission on builds/ @jacobvosmaer I missed that :( See merge request !1500
\| *	Back and forth permission on builds/migration-doc-fix	Kamil Trzcinski	2015-10-02	1	-1/+8
\| \|
* \|	Merge branch 'ensure-ci-project' into 'master'	Dmitriy Zaporozhets	2015-10-02	11	-122/+21
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure GitLab CI project exists when CI service is activated manually 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 This fix also bring us to the point when fork of project is a bit broken and have unnecessary code so I made cleanup. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1491
\| *	Fix tests	Dmitriy Zaporozhets	2015-10-02	2	-29/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Remove unnecessary fork ci logic	Dmitriy Zaporozhets	2015-10-02	5	-84/+8
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Prevent creating 2 Ci::Project entities when enable CI	Dmitriy Zaporozhets	2015-10-02	5	-10/+5
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	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>
* \|	Added benchmark-ips to the Gemfile	Yorick Peterse	2015-10-02	2	-0/+4
\| \| \| \| \| \| \| \| \| \|	This allows me to use this Gem for benchmarking without having to add/remove it every time.
* \|	Merge branch 'add_last_push_widget' into 'master'	Dmitriy Zaporozhets	2015-10-02	2	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add last push widget to starred projects dashboard This adds the last push widget to the starred projects dashboard. If a user set the starred projects dashboard as their preferred dashboard they would not see last push widget. The look is seamless between starred and 'your projects' dashboards. ### Screenshot: ![Screen_Shot_2015-10-01_at_3.15.52_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2f5dcf49c3d0186bdd05bb6788b143f1/Screen_Shot_2015-10-01_at_3.15.52_PM.png) See merge request !1304
\| * \|	Add last push widget to starred projects dashboard	Drew Blessing	2015-10-01	2	-0/+4
\| \| \|
* \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Robert Speicher	2015-10-01	3	-3/+38
\|\ \ \
\| * \ \	Merge branch 'upgrade-version' into 'master'	Patricio Cano	2015-10-01	1	-3/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to rake tasks I believe there should be a link to rake tasks from backup restore, to give the user more options. That is why I added the link in the documentation. Because of tweet https://twitter.com/gordonjb/status/641252693701476352 See merge request !1928
\| \| * \ \	solved conflict	karen Carias	2015-09-30	757	-2068/+21025
\| \| \|\ \ \
\| \| * \| \| \|	made info more clear	karen Carias	2015-09-09	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	link to rake tasks	karen Carias	2015-09-08	1	-1/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'create-issue' into 'master'	Patricio Cano	2015-10-01	2	-0/+29
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New doc about how to create an issue in GitLab Basics See merge request !1925
\| \| * \| \| \|	more info about MR and mentions	karen Carias	2015-08-31	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	New doc about how to create an issue	karen Carias	2015-08-25	2	-0/+29
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of https://github.com/gitlabhq/gitlabhq	Stan Hu	2015-10-01	2	-1/+7
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #9684 from NKMR6194/master	Stan Hu	2015-10-01	2	-1/+7
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	Fix link with emoji
\| \| * \| \| \| \|	Fix link with emoji	SAKATA Sinji	2015-10-02	2	-1/+7
\| \| \| \|_\|/ / \| \| \|/\| \| \|
* \| \| \| \| \|	Merge branch 'rs-update-note' into 'master'	Robert Speicher	2015-10-01	4	-9/+14
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure updated notes are syntax highlighted See merge request !1444
\| * \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-10-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \|	Simplify Note#editable?rs-update-note	Robert Speicher	2015-09-30	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Ensure notes are highlighted properly when they're updated	Robert Speicher	2015-09-30	1	-7/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Don't render the edit_form view for system notes	Robert Speicher	2015-09-30	1	-1/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'mail-footer-text' into 'master'	Dmitriy Zaporozhets	2015-10-01	2	-2/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change email footer text Old: > You're receiving this notification because you are a member of the GitLab.org / GitLab Community Edition project team. New: > You're receiving this notification because you've contributed to the GitLab.org / GitLab Community Edition project. See merge request !1409
\| * \| \| \| \| \|	Remove email footer text	Zeger-Jan van de Weg	2015-10-01	2	-2/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'update-gitlab-git' into 'master'	Robert Speicher	2015-10-01	2	-3/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab_git to 7.2.17 Fixes #2316. See merge request !1464
\| * \| \| \| \| \|	Update gitlab_git to 7.2.17.	Douwe Maan	2015-10-01	2	-3/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'etc-default-gitlab' into 'master'	Drew Blessing	2015-10-01	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix path to /etc/default/gitlab in 8.0 update guide See merge request !1437
\| * \| \| \| \| \|	Fix path to /etc/default/gitlab in 8.0 update guideetc-default-gitlab	Jacob Vosmaer	2015-09-25	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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>