summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Only look up Commit authors/committers by emailrs-issue-1850Robert Speicher2015-06-232-10/+6
| | |/ | |/|
* | | Merge branch 'application_settings_form' into 'master'Dmitriy Zaporozhets2015-06-242-53/+57
|\ \ \
| * | | Changed the placement of Restricted Domainsapplication_settings_formDarby2015-06-231-6/+8
| * | | Updated the categories of Application Settings FormDarby2015-06-232-54/+56
| |/ /
* | | Allow user to remove public email addressrs-dev-issue-2419Robert Speicher2015-06-231-1/+3
|/ /
* | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-2311-237/+339
|\ \
| * \ Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-236-36/+62
| |\ \
| * | | Set proper title when edit identity from admin areaDmitriy Zaporozhets2015-06-231-1/+1
| * | | Fix admin identities codeDmitriy Zaporozhets2015-06-232-2/+2
| * | | Fix code style issueDmitriy Zaporozhets2015-06-221-1/+1
| * | | Address review commentsDmitriy Zaporozhets2015-06-221-7/+5
| * | | Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-2256-301/+539
| |\ \ \
| * | | | Fix indendity testDmitriy Zaporozhets2015-06-221-1/+1
| * | | | Refactor admin user pageDmitriy Zaporozhets2015-06-227-235/+242
| * | | | 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-193-17/+24
| * | | | Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-194-4/+50
| * | | | Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-193-0/+46
* | | | | Merge branch 'fix-delete-user-error' into 'master'Dmitriy Zaporozhets2015-06-233-2/+8
|\ \ \ \ \
| * | | | | Fix error when deleting a user who has projectsStan Hu2015-06-233-2/+8
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-issue-1771-2' into 'master'Douwe Maan2015-06-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed invalid timestamps in RSS feed #1771Rowan Wookey2015-06-231-1/+1
| | |/ / | |/| |
* | | | Validate presence of provider field in Identityidentity-validationDmitriy Zaporozhets2015-06-231-0/+1
| |_|/ |/| |
* | | Merge branch 'animation-sidebar' into 'master'Dmitriy Zaporozhets2015-06-234-18/+38
|\ \ \
| * | | fixed the resizing icon issueanimation-sidebarDarby2015-06-221-2/+2
| * | | Edited the CSS of header and sidebar; added a new class of logo-container to ...Darby2015-06-194-16/+36
* | | | Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-232-18/+24
|\ \ \ \ | |_|/ / |/| | |
| * | | Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-221-14/+3
| * | | Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-201-4/+4
| * | | Allow Admin to filter users by 2FA statusRobert Speicher2015-06-192-4/+21
* | | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-2211-35/+35
|\ \ \ \
| * | | | Fix closed merge request scope at milestone pageDmitriy Zaporozhets2015-06-221-1/+1
| * | | | Revert merge request states renamingDmitriy Zaporozhets2015-06-1911-34/+34
| | |_|/ | |/| |
* | | | 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 'remove_unused_except' into 'master'Dmitriy Zaporozhets2015-06-221-2/+2
|\ \ \ \ \
| * | | | | projects doesn't seem to be a valid action in this controllerEaden2015-05-161-2/+2
* | | | | | Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets2015-06-228-13/+19
|\ \ \ \ \ \
| * | | | | | Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-225-9/+4
| * | | | | | Update mock and stub syntax for specsRobert Speicher2015-06-223-4/+15
* | | | | | | Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-221-33/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-171-33/+0
* | | | | | | | Merge branch 'new-logo' into 'master'Dmitriy Zaporozhets2015-06-227-2/+58
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Replace old logo with new onenew-logoDmitriy Zaporozhets2015-06-197-2/+58
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'web-editor-autocrlf' into 'master'Dmitriy Zaporozhets2015-06-221-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlfDouwe Maan2015-06-201-1/+6
* | | | | | | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-2216-119/+228
|\ \ \ \ \ \ \ \
| * | | | | | | | Add MergeRequestTabs specsrs-dev-issue-2355Robert Speicher2015-06-211-44/+89
| * | | | | | | | Minor style fixes in MergeRequestTabsRobert Speicher2015-06-211-2/+2
View Lorry Controller Status