summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-253-23/+16
* Trigger sticky_kit:recalc when diffs are pre-loadedRobert Speicher2015-06-251-3/+9
* Reorder MergeRequestTabs constructorRobert Speicher2015-06-251-3/+3
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-252-44/+37
|\
| * Merge branch 'sidebar-animation' into 'master'Dmitriy Zaporozhets2015-06-252-44/+37
| |\
| | * Have sidebar labels disappear behind content instead of hide immediately.sidebar-animationDouwe Maan2015-06-252-44/+37
| |/
* | Merge branch 'highlight-link-sidebar' into 'master'Dmitriy Zaporozhets2015-06-251-1/+1
|\ \ | |/ |/|
| * prettier highlighting of active link in the sidebarJob van der Voort2015-06-251-1/+1
|/
* Merge branch 'rs-random-placeholder-tip' into 'master'Dmitriy Zaporozhets2015-06-254-24/+35
|\
| * Prefix random Markdown tips with "Tip:"rs-random-placeholder-tipRobert Speicher2015-06-242-2/+2
| * Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-234-24/+35
* | Merge branch 'project_icon_removal' into 'master'Dmitriy Zaporozhets2015-06-251-2/+0
|\ \
| * | Removed the icons from the New Issue and New Project buttonsproject_icon_removalDarby2015-06-241-2/+0
* | | Merge branch 'rs-default-admin-password' into 'master'Dmitriy Zaporozhets2015-06-256-6/+7
|\ \ \
| * | | Add CHANGELOG entry for default password changers-default-admin-passwordRobert Speicher2015-06-241-0/+1
| * | | Change default admin password from "5iveL!fe" to "password"Robert Speicher2015-06-245-6/+6
* | | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-06-2510-16/+33
|\ \ \ \ | |/ / / |/| | |
| * | | 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 '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