- 19 Jun, 2015 17 commits
-
-
Robert Speicher authored
Refactor and spec line highlighting Javascript - Replaces the fragile Spinach tests for this feature with Jasmine tests - The "Don't scroll the page when we click a line number" behavior now works as expected See merge request !820
-
Robert Speicher authored
-
Douwe Maan authored
Show user 2FA status on Admin::Users#show | Enabled | Disabled | | ------- | -------- | | ![Screen_Shot_2015-06-19_at_2.58.42_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b81f6a992366105c14e03852385b28f0/Screen_Shot_2015-06-19_at_2.58.42_PM.png) | ![Screen_Shot_2015-06-19_at_2.58.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bb8fd11b6c27615eef19154ffabe2de/Screen_Shot_2015-06-19_at_2.58.30_PM.png) | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2415 See merge request !851
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Jacob Vosmaer authored
Update maintenance documentation to explain no need to recompile asssets for omnibus installations See merge request !847
-
Stan Hu authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
These are well covered by the new Jasmine tests, and faster!
-
Robert Speicher authored
-
Robert Speicher authored
-
Robert Speicher authored
-
Dmitriy Zaporozhets authored
Revert "Changed the placeholder text and modified the css class to make it visible" This reverts commit c39c8234. /cc @marin See merge request !845
-
Marin Jankovski authored
-
- 18 Jun, 2015 9 commits
-
-
Hannes Rosenögger authored
Add init test for ProjectSearchResults Regression test for: https://github.com/gitlabhq/gitlabhq/pull/9368 See merge request !788
-
Dmitriy Zaporozhets authored
Add a build preparation script, modify gitlab.ci.yml to use the script. Updated the .gitlab-ci.yml to use a script which contains build preparation for runners which might run docker images with CI runner. Regular builds should be not affected. See merge request !834
-
Douwe Maan authored
Fix 403 Access Denied error messages when accessing Labels section in a project This would occur if the project's issues or merge requests features were disabled. The change in 9bcd3639 caused `can?(current_user, :read_merge_request, project)` to be false if the merge request feature were disabled, so `authorize_labels!` needs to be changed accordingly. Closes #1813 See merge request !836
-
Stan Hu authored
Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled Closes #1813
-
Douwe Maan authored
Fix behavior of ldap_person method in Gitlab::OAuth::User Code tweaks in 45e9150a caused the ldap_person method to not return expected results. Improved tests to cover the ldap_person method, which was previously stubbed. Restored the previous implementation of ldap_person, as I could not find a more concise to write it that still works with all the test cases. See merge request !837
-
Marin Jankovski authored
-
Marin Jankovski authored
- 17 Jun, 2015 14 commits
-
-
Alex Lossent authored
Code tweaks in 45e9150a caused the ldap_person method to not return expected results. Improved tests to cover the ldap_person method, which was previously stubbed.
-
Sytse Sijbrandij authored
Add 'proposed tweet' for RC1 See merge request !835
-
Jacob Vosmaer authored
-
Marin Jankovski authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: Gemfile.lock
-
Dmitriy Zaporozhets authored
Fix duplicate 'Email has already been taken' message when creating a user devise :validatable and validates uniqueness set on the user email field cause 2 validations to fire when creating a new user with an email address already in use, Issue 6123 @stanhu Thanks for your input on merge request 807, I'll close that one in favour of this as I have added tests See merge request !817
-
Dmitriy Zaporozhets authored
Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org') https://dev.gitlab.org/gitlab/gitlabhq/issues/2373 See merge request !821
-
Job van der Voort authored
added info about migrating to gitlab.com Added useful information. Because of tweet https://twitter.com/A_Makedonsky/status/610860840036749314 See merge request !1870
-
Dmitriy Zaporozhets authored
Bump rails to 4.1.11, jquery-rails to 3.1.3 rails 4.1.11 notes - http://weblog.rubyonrails.org/2015/6/16/Rails-3-2-22-4-1-11-and-4-2-2-have-been-released-and-more/ jquery-rails < 3.1.3 security advisory: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY See merge request !830
-
Karen Carias authored
-
Robert Speicher authored
-
Robert Speicher authored
-