9573 Commits

Include renames

Author	SHA1	Message	Date
Dmitriy Zaporozhets	39772f0116	Merge branch 'ci-web-hooks'	2015-10-05 15:01:40 +02:00
Valery Sizov	31330e4a3c	Fix anchors to comments in diffs	2015-10-05 14:00:41 +03:00
Dmitriy Zaporozhets	ecbe393b8d	CI web hooks menu active state and consitent title ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-05 10:51:25 +02:00
Dmitriy Zaporozhets	c293cc9152	Move CI web hooks page to project settings area ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-05 10:47:23 +02:00
Guilherme Garnier	1cfb48ddd0	Merge remote-tracking branch 'upstream/master'	2015-10-03 11:46:29 -05:00
Dmitriy Zaporozhets	662f8af497	Merge branch 'fix-cache-key-expiration-for-commits' into 'master' ... Fix bug where transferring a project would result in stale commit links Transferring a project to another namespace updates the project's updated_at field, but since the cache key did not depend on the object, the page fragments were not invalidated. This resulted in stale links to the commits. Changing the cache key to use the project pathname solves this issue. Closes gitlab-org/omnibus-gitlab#843 See merge request !1497	2015-10-03 08:45:27 +00:00
Dmitriy Zaporozhets	2b493695a3	Merge branch 'projects' into 'master' ... Improve project page height old thing. Grey block not aligned to the bottom. It was a scroll even with short project description.  New awesome stuff, no scroll, grey block aligned to the bottom.  See merge request !1487	2015-10-03 08:44:06 +00:00
Guilherme Garnier	2b075f16c7	Fix rubocop warnings in app	2015-10-03 00:56:37 -05:00
Stan Hu	3fbcc51102	Update README cache key to use full project namespace	2015-10-02 13:26:42 -07:00
Stan Hu	dbc85bfa01	Fix bug where transferring a project would result in stale commit links ... Transferring a project to another namespace updates the project's updated_at field, but since the cache key did not depend on the object, the page fragments were not invalidated. This resulted in stale links to the commits. Changing the cache key to use the object pathname solves this issue. Closes gitlab-org/omnibus-gitlab#843	2015-10-02 11:24:17 -07:00
Andrey	75c03530f8	removed max-heght from project.scss	2015-10-02 17:08:12 +02:00
Dmitriy Zaporozhets	b5c12f742a	Merge remote-tracking branch 'public/hide_services_password'	2015-10-02 16:48:38 +02:00
Dmitriy Zaporozhets	0e7b96bf48	Merge branch 'access_level_badge_bug' into 'master' ... Fix: Wrong access level badge on MR comments https://gitlab.com/gitlab-org/gitlab-ce/issues/2654 See merge request !1501	2015-10-02 14:39:58 +00:00
Andrey	acdb5f34cf	max height to layout.scss	2015-10-02 16:38:37 +02:00
Douwe Maan	93522e59ec	Merge branch 'rs-throttle-reset' into 'master' ... Throttle "Forgot your password?" emails Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 See merge request !1476	2015-10-02 14:37:07 +00:00
Valery Sizov	97e6c9b42c	Wrong access level badge on MR comments	2015-10-02 15:11:17 +03:00
Dmitriy Zaporozhets	c7e323438e	Merge branch 'ensure-ci-project' into 'master' ... 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	2015-10-02 10:39:31 +00:00
Andrey	5ebcf21b81	section and .content now in layout.cssc	2015-10-02 12:01:46 +02:00
Valery Sizov	731b860976	Hide password in the service settings form	2015-10-02 12:48:57 +03:00
Andrey	fd86b66914	CSS markup fixed ... Everything is fixed according DZ comments. Added a bit sexy transition for our project buttons ><	2015-10-02 11:24:12 +02:00
Dmitriy Zaporozhets	37e9e71ea1	Remove unnecessary fork ci logic ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-02 10:26:56 +02:00
Dmitriy Zaporozhets	5de0b07844	Prevent creating 2 Ci::Project entities when enable CI ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-02 10:08:16 +02:00
Dmitriy Zaporozhets	b69b2520b1	Merge branch 'add_last_push_widget' into 'master' ... 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:  See merge request !1304	2015-10-02 07:55:02 +00:00
Robert Speicher	b8ff38b1d4	Refactor PasswordsController to use before_actions	2015-10-01 21:47:27 -04:00
Robert Speicher	ad7ad8745a	Add User#recently_sent_password_reset?	2015-10-01 21:41:56 -04:00
Stan Hu	2432072466	Merge branch 'master' of https://github.com/gitlabhq/gitlabhq	2015-10-01 14:12:43 -07:00
Robert Speicher	8366ce364c	Merge branch 'rs-update-note' into 'master' ... Ensure updated notes are syntax highlighted See merge request !1444	2015-10-01 17:10:52 -04:00
Stan Hu	1c53c28c79	Merge pull request #9684 from NKMR6194/master ... Fix link with emoji	2015-10-01 14:10:34 -07:00
Drew Blessing	788a3f9b94	Add last push widget to starred projects dashboard	2015-10-01 15:17:32 -05:00
Zeger-Jan van de WegandZeger-Jan van de Weg	d8bc642312	Remove email footer text	2015-10-01 19:51:59 +02:00
SAKATA Sinji	a3c6ed5c46	Fix link with emoji	2015-10-02 01:26:19 +09:00
Dmitriy Zaporozhets	e3bc0e2104	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 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 18:10:09 +02:00
Dmitriy Zaporozhets	e0609a7800	Merge branch 'show-diff-stats-for-mr'	2015-10-01 17:02:53 +02:00
Dmitriy Zaporozhets	958e727f70	Merge branch 'fix-email-typo' into 'master' ... 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	2015-10-01 15:00:22 +00:00
Dmitriy Zaporozhets	7b55d2c5b7	Merge branch 'fix-visit-project-button' into 'master' ... 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"  See merge request !1344	2015-10-01 14:58:23 +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
Dmitriy Zaporozhets	e2576d588f	Avoid unnecessary usage of local vars ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 15:51:28 +02: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
Andrey	a4383aea4c	css aligning	2015-10-01 14:18:12 +02: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
Andrey	efeeed2a0a	content block height fix	2015-10-01 14:06:29 +02:00
Dmitriy Zaporozhets	0d967bce57	Show additions/deletions stats on merge request diff ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 13:52:08 +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	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