summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-222-38/+3
* Correct AddDefaultOtpRequiredForLoginValue migrationRobert Speicher2015-06-221-1/+3
* Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-204-8/+17
* Add CHANGELOG entry for 2FA status and filtering in admin areaRobert Speicher2015-06-191-0/+2
* Allow Admin to filter users by 2FA statusRobert Speicher2015-06-194-14/+97
* Merge branch 'rs-dev-issue-2415' into 'master'Douwe Maan2015-06-1910-18/+81
|\
| * Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-195-9/+9
| * Add 2FA status to Admin::Users#showRobert Speicher2015-06-192-4/+32
| * Add convenience methods to User for getting and setting 2FA statusRobert Speicher2015-06-193-1/+37
| * Move the User dashboard enum further up in the classRobert Speicher2015-06-191-4/+3
|/
* Merge branch 'update-rake-docs-for-omnibus-assets' into 'master'Jacob Vosmaer2015-06-192-4/+10
|\
| * Update maintenance documentation to explain no need to recompile asssets for ...Stan Hu2015-06-192-4/+10
|/
* Merge branch 'revert-placeholder' into 'master'Dmitriy Zaporozhets2015-06-192-5/+24
|\
| * Revert "Changed the placeholder text and modified the css class to make it vi...revert-placeholderDarby2015-06-182-5/+24
* | Set build preparation script as executable.Marin Jankovski2015-06-191-0/+0
|/
* Merge branch 'add-test-for-project-search-results' into 'master'Hannes Rosenögger2015-06-181-0/+23
|\
| * Add init test for ProjectSearchResultsStan Hu2015-06-181-0/+23
* | Merge branch 'build_script' into 'master'Dmitriy Zaporozhets2015-06-182-10/+28
|\ \ | |/ |/|
| * Use correct name for the script.build_scriptMarin Jankovski2015-06-181-1/+1
| * Move prepare_build script to scripts dir.Marin Jankovski2015-06-182-1/+1
| * Add a build preparation script, modify gitlab.ci.yml to use the script.Marin Jankovski2015-06-172-10/+28
* | Merge branch 'fix-labels-permisssion-check' into 'master'Douwe Maan2015-06-184-7/+43
|\ \
| * | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-184-7/+43
* | | Merge branch 'fix/oauth_user_ldap_person' into 'master'Douwe Maan2015-06-182-50/+61
|\ \ \
| * | | Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent2015-06-172-50/+61
* | | | Merge branch 'link-to-rc-packages-in-tweet' into 'master'Sytse Sijbrandij2015-06-171-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Add 'proposed tweet' for RC1link-to-rc-packages-in-tweetJacob Vosmaer2015-06-171-2/+4
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-173-2/+29
|\ \ \
| * \ \ Merge branch 'swellard-issue-6123' into 'master'Dmitriy Zaporozhets2015-06-172-1/+24
| |\ \ \
| | * | | Fix duplicate 'Email has already been taken' message when creating a user, up...swellard2015-06-161-1/+1
| | * | | Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-162-1/+24
| * | | | Merge branch 'rs-dev-issue-2373' into 'master'Dmitriy Zaporozhets2015-06-171-1/+5
| |\ \ \ \
| | * | | | Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-06-171-0/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'from_own_instance' into 'master'Job van der Voort2015-06-171-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | added info about migrating to gitlab.comKaren Carias2015-06-171-0/+3
* | | | | | Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-173-27/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-163-24/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-rails-update' into 'master'Dmitriy Zaporozhets2015-06-172-34/+37
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Bump jquery-rails gem versionrs-rails-updateRobert Speicher2015-06-162-3/+3
| * | | | Bump rails to 4.1.11, and make the version requirement exactRobert Speicher2015-06-162-31/+34
|/ / / /
* | | | Merge branch 'rs-bootlint-fixes' into 'master'Robert Speicher2015-06-1620-29/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Bootlint: Fix incorrectly nested `form-group` elementRobert Speicher2015-06-161-2/+2
| * | | Bootlint: Add missing `type` attribute for buttonsRobert Speicher2015-06-162-1/+3
| * | | Bootlint: Modals no longer need a '.hide' classRobert Speicher2015-06-168-8/+8
| * | | Bootlint: Use offset grid classes instead of empty divsRobert Speicher2015-06-1610-18/+10
|/ / /
* | | Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan2015-06-1612-44/+139
|\ \ \ | |_|/ |/| |
| * | Support commenting on a diff in side-by-side viewStan Hu2015-06-1612-44/+139
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-161-0/+8
|\ \ \
| * \ \ Merge branch 'require_kerberos_when_enabled' into 'master'Dmitriy Zaporozhets2015-06-161-0/+8
| |\ \ \ | | |/ / | |/| |
View Lorry Controller Status