summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add CHANGELOG itemperformance-improvementsDmitriy Zaporozhets2015-06-241-0/+1
* Improve performance for merge_request#show pageDmitriy Zaporozhets2015-06-243-6/+9
* Improve performance for issue#show pageDmitriy Zaporozhets2015-06-244-9/+13
* Enable rack profiler by defaultDmitriy Zaporozhets2015-06-242-1/+10
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-244-54/+63
|\
| * Merge branch 'application_settings_form' into 'master'Dmitriy Zaporozhets2015-06-243-53/+60
| |\
| | * Changed the placement of Restricted Domainsapplication_settings_formDarby2015-06-231-6/+8
| | * Updated the categories of Application Settings FormDarby2015-06-233-54/+59
| * | Merge branch 'rs-dev-issue-2419' into 'master'Dmitriy Zaporozhets2015-06-241-1/+3
| |\ \ | | |/ | |/|
| | * Allow user to remove public email addressrs-dev-issue-2419Robert Speicher2015-06-231-1/+3
| |/
* | Merge branch 'create_ssh' into 'master'Job van der Voort2015-06-232-1/+38
|\ \
| * | added final phrase in dockaren Carias2015-06-231-0/+1
| * | added requested changeskaren Carias2015-06-231-11/+0
| * | added images to dockaren Carias2015-06-221-9/+9
| * | added new file about creating your SSH keyskaren Carias2015-06-222-1/+48
* | | Merge branch 'k-link-basicdocs' into 'master'Job van der Voort2015-06-231-0/+1
|\ \ \ | |_|/ |/| |
| * | added link to GitLab Basicskaren Carias2015-06-231-0/+1
* | | Merge branch 'fix-readme-avatar' into 'master'Dmitriy Zaporozhets2015-06-231-1/+1
|\ \ \ | |/ / |/| |
| * | Revert avatar URL to original versionStan Hu2015-06-231-1/+1
|/ /
* | Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets2015-06-2323-73/+91
|\ \
| * | Replace GITLAB with GitLab in rake task descriptionsDmitriy Zaporozhets2015-06-2319-37/+37
| * | Refactor rake tasks for testsDmitriy Zaporozhets2015-06-233-29/+25
| * | Split rspec and spinach tests in parallelDmitriy Zaporozhets2015-06-231-7/+29
* | | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-236-3/+47
|\ \ \ | |/ / |/| |
| * | Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-236-3/+47
* | | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-2316-238/+424
|\ \ \
| * | | Fix tests for admin identities after migrate to rspec3Dmitriy Zaporozhets2015-06-231-5/+2
| * | | Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-2318-94/+175
| |\ \ \
| * | | | 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-22225-1059/+1836
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix indendity testDmitriy Zaporozhets2015-06-223-6/+15
| * | | | Refactor admin user pageDmitriy Zaporozhets2015-06-228-235/+245
| * | | | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-222-3/+22
| * | | | Minor improvements to admin identities textDmitriy Zaporozhets2015-06-222-4/+2
| * | | | Add tests for admin managing user identitiesDmitriy Zaporozhets2015-06-192-1/+54
| * | | | Move identities list to own controller actionDmitriy Zaporozhets2015-06-194-18/+25
| * | | | Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-196-6/+52
| * | | | Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-195-0/+49
* | | | | Merge branch 'fix-delete-user-error' into 'master'Dmitriy Zaporozhets2015-06-236-3/+34
|\ \ \ \ \
| * | | | | Fix error when deleting a user who has projectsStan Hu2015-06-236-3/+34
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-issue-1771-2' into 'master'Douwe Maan2015-06-232-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixed invalid timestamps in RSS feed #1771Rowan Wookey2015-06-232-1/+2
| | |/ / | |/| |
* | | | Merge branch 'rubocop-for-tests' into 'master'Dmitriy Zaporozhets2015-06-2395-530/+583
|\ \ \ \
| * | | | Fix rubocop issues after merge of recent masterDmitriy Zaporozhets2015-06-232-7/+7
| * | | | Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-23122-616/+735
| |\ \ \ \
| * | | | | Fix Style/NonNilCheck cop violationsrubocop-for-testsStan Hu2015-06-221-1/+1
| * | | | | Fix Style/IndentationWidth cop violationsStan Hu2015-06-224-8/+8
View Lorry Controller Status