delta/gitlab/gitlab-ce.git/spec/controllers, branch fix/serialized-commit-path

delta/gitlab/gitlab-ce.git/spec/controllers, branch fix/serialized-commit-path gitlab.com: gitlab-org/gitlab-ce.git fixes the issue 2017-01-12T20:49:48+00:00 Tiago Botelho tiagonbotelho@hotmail.com 2017-01-12T20:49:48+00:00 bf4a042f6a810aef6f66b109c088f6a80d8c8a5d

Merge branch 'master' into auto-pipelines-vue 2017-01-09T17:54:02+00:00 Regis boudinot.regis@yahoo.com 2017-01-09T17:54:02+00:00 6625f479f857aefde855f45d3e2c820bfbb872e3

Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' 2017-01-06T20:17:34+00:00 Alfredo Sumaran alfredo@gitlab.com 2017-01-06T20:17:34+00:00 9cdfcbb50f225162fd46162e13e5b685819c9543 Moved the members and groups to single option called members Closes #25985 See merge request !8281


Moved the members and groups to single option called members

Closes #25985

See merge request !8281

Merge branch 'master' into auto-pipelines-vue 2017-01-04T17:55:25+00:00 Regis boudinot.regis@yahoo.com 2017-01-04T17:55:25+00:00 1655824fa44c428b9570dc96688d27faef186024

Fixed tests 2017-01-03T16:52:14+00:00 Jose Ivan Vargas jvargas@gitlab.com 2016-12-28T20:44:50+00:00 90f18d9e87a6d119a2334cccd48869c0c78f7681

Added tests for the MembersController and corrected some more tests 2017-01-03T16:52:14+00:00 Jose Ivan Vargas jvargas@gitlab.com 2016-12-26T22:15:32+00:00 cfd8f635b391c9389aa122db4e0c9031adef6b5a

Removed the "Groups" option from the settings gear 2017-01-03T16:52:14+00:00 Jose Ivan Vargas jvargas@gitlab.com 2016-12-26T16:12:24+00:00 57b5612aaa6fd243f18587acbf0a8ebbb37551f2 Fixed more tests

Fixed more tests

Fixed rspec tests for the project members also fixed the index 2017-01-03T16:52:14+00:00 Jose Ivan Vargas jvargas@gitlab.com 2016-12-23T18:23:04+00:00 68c730bb99a12b0ea8ac3d08f074dc66e7ac2dae view (removed an extra tag )

view (removed an extra tag )

Properly handle failed reCAPTCHA on user registration 2017-01-03T07:35:42+00:00 Drew Blessing drew@gitlab.com 2017-01-03T07:08:21+00:00 ca1c492bafa024ad4c185e930af57e1f8090ca77 If a user presses the 'Register' button too quickly after attempting to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the user would experience a 500 error. Now, the case is properly handled and the user will be sent back to the registration page with a clear error message and can try again.

If a user presses the 'Register' button too quickly after attempting
to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the
user would experience a 500 error. Now, the case is properly
handled and the user will be sent back to the registration page
with a clear error message and can try again.

fix pipelines/index.html.haml merge conflict 2017-01-02T23:24:37+00:00 Regis boudinot.regis@yahoo.com 2017-01-02T23:24:37+00:00 0a074f2e091d8b2f1bce49e50ecf69b667c62dc2