summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-231-1/+1
* Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-233-2/+12
|\
| * Merge branch 'animation-sidebar' into 'master'Dmitriy Zaporozhets2015-06-232-2/+4
| |\
| | * Edited the CSS of header and sidebar; added a new class of logo-container to ...Darby2015-06-192-2/+4
| * | Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-231-0/+8
| |\ \
| | * | Allow Admin to filter users by 2FA statusRobert Speicher2015-06-191-0/+8
* | | | Set proper title when edit identity from admin areaDmitriy Zaporozhets2015-06-231-1/+1
* | | | Fix admin identities codeDmitriy Zaporozhets2015-06-231-1/+1
* | | | Fix code style issueDmitriy Zaporozhets2015-06-221-1/+1
* | | | Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-2220-41/+46
|\ \ \ \ | |/ / /
| * | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-227-17/+12
| |\ \ \
| | * | | Fix closed merge request scope at milestone pageDmitriy Zaporozhets2015-06-221-1/+1
| | * | | Revert merge request states renamingDmitriy Zaporozhets2015-06-197-16/+11
| * | | | Merge branch 'see-full-size-avatar' into 'master'Dmitriy Zaporozhets2015-06-221-1/+2
| |\ \ \ \
| | * | | | When we want to see the fullsize avatar of a user we can click the avatar on ...Sander Boom2015-03-211-1/+2
| * | | | | Merge branch 'new-logo' into 'master'Dmitriy Zaporozhets2015-06-221-1/+1
| |\ \ \ \ \
| | * | | | | Replace old logo with new onenew-logoDmitriy Zaporozhets2015-06-191-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-227-11/+11
| |\ \ \ \ \
| | * | | | | Use `skip_js` for commit timestampsRobert Speicher2015-06-171-1/+1
| | * | | | | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-2/+2
| | * | | | | Update time_ago_with_tooltip helperRobert Speicher2015-06-175-8/+8
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-224-10/+19
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'new-mr-disable-change-target-branch' into 'master'Douwe Maan2015-06-201-6/+7
| | |\ \ \ \ \
| | | * | | | | Disable changing of target branch in new merge request page when a branch has...Stan Hu2015-06-191-6/+7
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'rs-blobview-js-refactor' into 'master'Robert Speicher2015-06-191-3/+3
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Simplify line numberingRobert Speicher2015-06-191-1/+1
| | | * | | | Refactor and spec BlobView JSRobert Speicher2015-06-191-2/+2
| | | |/ / /
| | * | | | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-191-1/+1
| | * | | | Add 2FA status to Admin::Users#showRobert Speicher2015-06-191-0/+8
| | |/ / /
| * | | | Merge branch 'snippet_optional_filename' into 'master'Douwe Maan2015-06-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make snippet filename optional.Nicolas2015-06-201-1/+1
* | | | | Fix indendity testDmitriy Zaporozhets2015-06-221-1/+1
* | | | | Refactor admin user pageDmitriy Zaporozhets2015-06-226-234/+232
* | | | | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-221-3/+3
* | | | | Minor improvements to admin identities textDmitriy Zaporozhets2015-06-222-4/+2
* | | | | Move identities list to own controller actionDmitriy Zaporozhets2015-06-192-13/+16
* | | | | Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-193-0/+28
* | | | | Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-192-0/+25
|/ / / /
* | | | Revert "Changed the placeholder text and modified the css class to make it vi...revert-placeholderDarby2015-06-181-1/+1
| |/ / |/| |
* | | Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-171-1/+1
|\ \ \
| * | | Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-161-1/+1
* | | | 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-165-20/+26
|\ \ \ \
| * | | | Support commenting on a diff in side-by-side viewStan Hu2015-06-165-20/+26
| |/ / /
* | | | Merge branch 'header_layout_issue' into 'master'Douwe Maan2015-06-162-5/+4
|\ \ \ \
| * | | | Fix layout issue in header title truncation.Nicolas2015-06-162-5/+4
| |/ / /
* | | | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-163-14/+25
|\ \ \ \ | |/ / / |/| | |