Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve performance for issue#show page | Dmitriy Zaporozhets | 2015-06-24 | 4 | -9/+13 |
* | Enable rack profiler by default | Dmitriy Zaporozhets | 2015-06-24 | 1 | -0/+9 |
* | Merge branch 'application_settings_form' into 'master' | Dmitriy Zaporozhets | 2015-06-24 | 2 | -53/+57 |
|\ | |||||
| * | Changed the placement of Restricted Domainsapplication_settings_form | Darby | 2015-06-23 | 1 | -6/+8 |
| * | Updated the categories of Application Settings Form | Darby | 2015-06-23 | 2 | -54/+56 |
* | | Allow user to remove public email addressrs-dev-issue-2419 | Robert Speicher | 2015-06-23 | 1 | -1/+3 |
|/ | |||||
* | Merge branch 'admin-edit-identities' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 11 | -237/+339 |
|\ | |||||
| * | Merge branch 'master' into admin-edit-identitiesadmin-edit-identities | Dmitriy Zaporozhets | 2015-06-23 | 6 | -36/+62 |
| |\ | |||||
| * | | Set proper title when edit identity from admin area | Dmitriy Zaporozhets | 2015-06-23 | 1 | -1/+1 |
| * | | Fix admin identities code | Dmitriy Zaporozhets | 2015-06-23 | 2 | -2/+2 |
| * | | Fix code style issue | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+1 |
| * | | Address review comments | Dmitriy Zaporozhets | 2015-06-22 | 1 | -7/+5 |
| * | | Merge branch 'master' into admin-edit-identities | Dmitriy Zaporozhets | 2015-06-22 | 56 | -301/+539 |
| |\ \ | |||||
| * | | | Fix indendity test | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+1 |
| * | | | Refactor admin user page | Dmitriy Zaporozhets | 2015-06-22 | 7 | -235/+242 |
| * | | | Make provider a select for identities form in admin area | Dmitriy Zaporozhets | 2015-06-22 | 1 | -3/+3 |
| * | | | Minor improvements to admin identities text | Dmitriy Zaporozhets | 2015-06-22 | 2 | -4/+2 |
| * | | | Move identities list to own controller action | Dmitriy Zaporozhets | 2015-06-19 | 3 | -17/+24 |
| * | | | Add ability for admin to edit user identity | Dmitriy Zaporozhets | 2015-06-19 | 4 | -4/+50 |
| * | | | Admin can see and remove user identities | Dmitriy Zaporozhets | 2015-06-19 | 3 | -0/+46 |
* | | | | Merge branch 'fix-delete-user-error' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 3 | -2/+8 |
|\ \ \ \ | |||||
| * | | | | Fix error when deleting a user who has projects | Stan Hu | 2015-06-23 | 3 | -2/+8 |
* | | | | | Merge branch 'fix-issue-1771-2' into 'master' | Douwe Maan | 2015-06-23 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fixed invalid timestamps in RSS feed #1771 | Rowan Wookey | 2015-06-23 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Validate presence of provider field in Identityidentity-validation | Dmitriy Zaporozhets | 2015-06-23 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'animation-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 4 | -18/+38 |
|\ \ \ | |||||
| * | | | fixed the resizing icon issueanimation-sidebar | Darby | 2015-06-22 | 1 | -2/+2 |
| * | | | Edited the CSS of header and sidebar; added a new class of logo-container to ... | Darby | 2015-06-19 | 4 | -16/+36 |
* | | | | Merge branch 'rs-dev-issue-2414' into 'master' | Dmitriy Zaporozhets | 2015-06-23 | 2 | -18/+24 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414 | Robert Speicher | 2015-06-22 | 1 | -14/+3 |
| * | | | Make default value for otp_required_for_login false instead of null | Robert Speicher | 2015-06-20 | 1 | -4/+4 |
| * | | | Allow Admin to filter users by 2FA status | Robert Speicher | 2015-06-19 | 2 | -4/+21 |
* | | | | Merge branch 'revert-mr-state-names' | Dmitriy Zaporozhets | 2015-06-22 | 11 | -35/+35 |
|\ \ \ \ | |||||
| * | | | | Fix closed merge request scope at milestone page | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+1 |
| * | | | | Revert merge request states renaming | Dmitriy Zaporozhets | 2015-06-19 | 11 | -34/+34 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'see-full-size-avatar' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | When we want to see the fullsize avatar of a user we can click the avatar on ... | Sander Boom | 2015-03-21 | 1 | -1/+2 |
* | | | | | Merge branch 'remove_unused_except' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | projects doesn't seem to be a valid action in this controller | Eaden | 2015-05-16 | 1 | -2/+2 |
* | | | | | | Merge branch 'rs-rspec3' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 8 | -13/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace remaining references to `Note.create_cross_reference_note` | Robert Speicher | 2015-06-22 | 5 | -9/+4 |
| * | | | | | | Update mock and stub syntax for specs | Robert Speicher | 2015-06-22 | 3 | -4/+15 |
* | | | | | | | Merge branch 'rs-remove-link-to-override' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -33/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove overridden `link_to` helperrs-remove-link-to-override | Robert Speicher | 2015-06-17 | 1 | -33/+0 |
* | | | | | | | | Merge branch 'new-logo' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 7 | -2/+58 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Replace old logo with new onenew-logo | Dmitriy Zaporozhets | 2015-06-19 | 7 | -2/+58 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'web-editor-autocrlf' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlf | Douwe Maan | 2015-06-20 | 1 | -1/+6 |
* | | | | | | | | Merge branch 'rs-dev-issue-2355' into 'master' | Dmitriy Zaporozhets | 2015-06-22 | 16 | -119/+228 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add MergeRequestTabs specsrs-dev-issue-2355 | Robert Speicher | 2015-06-21 | 1 | -44/+89 |