summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Changed to using the btn classvis_btn_color_changeDarby2015-07-103-15/+2
* Changed the color of admin/application_settings buttonsDarby2015-06-242-1/+14
* Merge branch 'add-2fa-status-to-admin-api' into 'master'Robert Speicher2015-06-244-2/+7
|\
| * Add 2FA status to user admin APIStan Hu2015-06-234-2/+7
* | Merge branch 'master' into 'master'Stan Hu2015-06-242-1/+2
|\ \
| * \ Merge branch 'master' of gitlab.com:ameily/gitlab-ce into HEADAdam Meily2015-06-240-0/+0
| |\ \
| | * | Updated merge request merged web hook to correctly fire action=merged.Adam Meily2015-06-051-1/+1
| * | | Added CHANGELOG message for fixing MR webhookAdam Meily2015-06-241-0/+1
| * | | Updated merge request merged web hook to correctly fire action=merged.Adam Meily2015-06-241-1/+1
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-243-2/+9
|\ \ \
| * \ \ Merge branch 'explicit_error_ci' into 'master'Dmitriy Zaporozhets2015-06-243-2/+9
| |\ \ \
| | * | | update changelogexplicit_error_ciValery Sizov2015-06-231-0/+1
| | * | | Explicit error when commit not found in the GitLab CIValery Sizov2015-06-232-2/+8
* | | | | Merge branch 'stop-jumping' into 'master'Dmitriy Zaporozhets2015-06-241-5/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | stop jumping all content on collapsing and expanding the sidebarJob van der Voort2015-06-241-5/+1
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-243-20/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'rs-issue-1850' into 'master'Douwe Maan2015-06-243-20/+10
| |\ \ \ \
| | * | | | Only look up Commit authors/committers by emailrs-issue-1850Robert Speicher2015-06-233-20/+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