22224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Yorick Peterse	dbc05d4a62	Don't use "rm" for cleaning tmp/builds ... If this directory were to be empty this would result in warnings being printed to STDERR, cluttering spec output. Doing this in Ruby fixes this problem (and also removes the need for shell alltogether).	2015-10-02 16:25:47 +02:00
Valery Sizov	97e6c9b42c	Wrong access level badge on MR comments	2015-10-02 15:11:17 +03:00
Jacob Vosmaer	c867c22509	Merge branch 'migration-doc-fix' into 'master' ... Back and forth permission on builds/ @jacobvosmaer I missed that :( See merge request !1500	2015-10-02 11:25:00 +00:00
Kamil Trzcinski	a4292066f0	Back and forth permission on builds/	2015-10-02 12:44:20 +02: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
Yorick Peterse	2fa89a3dc6	Added benchmark-ips to the Gemfile ... This allows me to use this Gem for benchmarking without having to add/remove it every time.	2015-10-02 11:29:46 +02: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	3515cb9b2d	Fix tests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-02 11:02:05 +02:00
Douwe Maan	f012e07c4f	Document known issue with Reply by email and multiple application servers.	2015-10-02 08:46:39 +00: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	d40dd5cfe3	Conform to spec guidelines that only exist in my head ... [ci skip]	2015-10-02 00:14:47 -04:00
Robert Speicher	f036d4095e	Fix spec broken by updated Devise translations	2015-10-01 23:46:43 -04:00
Robert Speicher	16f8ca566b	Add custom protocol whitelisting to SanitizationFilter ... Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613	2015-10-01 23:40:29 -04:00
Robert Speicher	b8ff38b1d4	Refactor PasswordsController to use before_actions	2015-10-01 21:47:27 -04:00
Robert Speicher	c7b43126bd	Add recently_reset message to Devise translations	2015-10-01 21:46:51 -04:00
Robert Speicher	ad7ad8745a	Add User#recently_sent_password_reset?	2015-10-01 21:41:56 -04:00
Robert Speicher	19748ddee6	Update config/locales/devise.en.yml with latest version ... It looks like a lot of changes but it's not, they just sorted it alphabetically.	2015-10-01 21:38:39 -04:00
Robert Speicher	d7eceafb27	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	2015-10-01 17:13:59 -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
Robert Speicher	b35dd6b908	Update CHANGELOG ... [ci skip]	2015-10-01 17:08:22 -04:00
Drew Blessing	788a3f9b94	Add last push widget to starred projects dashboard	2015-10-01 15:17:32 -05:00
Dmitriy Zaporozhets	529cf138a1	Merge branch 'mail-footer-text' into 'master' ... 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	2015-10-01 20:11:16 +00:00
Robert Speicher	7bc48f7b1f	Merge branch 'update-gitlab-git' into 'master' ... Update gitlab_git to 7.2.17 Fixes #2316. See merge request !1464	2015-10-01 19:47:42 +00:00
Drew Blessing	b72cf6f2a2	Merge branch 'etc-default-gitlab' into 'master' ... Fix path to /etc/default/gitlab in 8.0 update guide See merge request !1437	2015-10-01 19:00:57 +00:00
Zeger-Jan van de WegandZeger-Jan van de Weg	d8bc642312	Remove email footer text	2015-10-01 19:51:59 +02:00
Patricio Cano	b48072d4fc	Merge branch 'upgrade-version' into 'master' ... 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	2015-10-01 16:32:15 +00:00
Patricio Cano	3e9772843c	Merge branch 'create-issue' into 'master' ... New doc about how to create an issue in GitLab Basics See merge request !1925	2015-10-01 16:29:29 +00: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
Stan Hu	e2108f16ec	Update upgrade guide for Redis >= 2.4.0 requirement ... [ci skip] Closes #2837	2015-10-01 08:41:20 -07:00
Dmitriy Zaporozhets	3fa8bd0e67	Merge branch 'ee_features_in_example_config' into 'master' ... Removes reference to Enterprise Edition ssh key sync feature. fixes #2042 See merge request !1017	2015-10-01 15:12:24 +00: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	9441f2dd0a	Add CHANGELOG item ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-10-01 16:34:41 +02:00
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
Cristian Bica	c528043439	Allow users to select the Files view as default project view	2015-10-01 17:05:20 +03: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