summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Do not disappoint rubocop.validate_token_and_url_format_for_gitlab_ciMarin Jankovski2015-07-171-1/+1
* Add specs for gitlab ci service validity.Marin Jankovski2015-07-172-0/+39
* Fix failing specs after adding format verification for token and project url ...Marin Jankovski2015-07-172-2/+2
* Validate format of project_url and token for GitLab CI service.Marin Jankovski2015-07-171-2/+6
* Merge branch 'create-branch' into 'master' Job van der Voort2015-07-167-66/+100
|\
| * fixed conflictkaren Carias2015-07-16107-242/+1079
| |\ | |/ |/|
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-07-162-2/+6
|\ \
| * \ Merge branch 'merge-request-wip-information' into 'master'Stan Hu2015-07-152-2/+6
| |\ \
| | * | api: expose work_in_progress flagBen Boeckel2015-07-102-2/+6
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-07-163-9/+8
|\ \ \ \
| * \ \ \ Merge pull request #9455 from rburchell/patch-1Stan Hu2015-07-141-8/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove author information from "post" in merge_requests API.Robin Burchell2015-07-131-8/+0
| * | | | Merge branch 'docker-image' into 'master'Kamil TrzciƄski2015-07-142-1/+8
| |\ \ \ \
| | * | | | Fix docker imagedocker-imageKamil Trzcinski2015-07-142-1/+8
| |/ / / /
* | | | | Merge branch 'time_ago_fix' into 'master' Dmitriy Zaporozhets2015-07-152-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Time ago fix for compare pageValery Sizov2015-07-152-0/+2
|/ / / /
* | | | Revert password change changelog entry.Sytse Sijbrandij2015-07-141-1/+0
* | | | Revert "Change default admin password from "5iveL!fe" to "password""Sytse Sijbrandij2015-07-145-5/+5
* | | | Merge branch 'notifications-title' into 'master' Job van der Voort2015-07-142-5/+3
|\ \ \ \
| * | | | fixed notifications titlekaren Carias2015-07-132-5/+3
| |/ / /
* | | | Merge branch 'fix-ed' into 'master' Dmitriy Zaporozhets2015-07-141-1/+1
|\ \ \ \
| * | | | Fix path to move_drop_indexes.edJacob Vosmaer2015-07-141-1/+1
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-145-3/+124
|\ \ \ \ \
| * \ \ \ \ Merge branch 'nice-scroll-sidebar' into 'master'Dmitriy Zaporozhets2015-07-144-2/+122
| |\ \ \ \ \
| | * | | | | Add nice scroll for sidebarDmitriy Zaporozhets2015-07-144-2/+122
| | |/ / / /
| * | | | | Merge branch 'scrollbar-issue' into 'master'Dmitriy Zaporozhets2015-07-141-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Hide scrollbar from sidebar when external mouse is connected to OSXKamil Trzcinski2015-07-141-1/+2
| |/ / / /
* | | | | Merge branch 'update-guide-713' into 'master' Valery Sizov2015-07-142-11/+140
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | create update guides for 7.13Job van der Voort2015-07-142-11/+140
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-142-8/+11
|\ \ \ \
| * \ \ \ Merge branch 'rs-fix-coverage' into 'master'Dmitriy Zaporozhets2015-07-142-8/+11
| |\ \ \ \
| | * | | | Move coverage-related setup back to spec_helperrs-fix-coverageRobert Speicher2015-07-132-8/+11
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-146-18/+81
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'rs-issue-1773' into 'master'Dmitriy Zaporozhets2015-07-146-18/+81
| |\ \ \ \ \
| | * | | | | Rename `notice_added_references` to `create_new_cross_references!`rs-issue-1773Robert Speicher2015-07-136-12/+12
| | * | | | | Refactor Mentionable#notice_added_referencesRobert Speicher2015-07-132-11/+74
| | |/ / / /
* | | | | | Merge branch 'mysql-to-postgres-ed' into 'master' Dmitriy Zaporozhets2015-07-141-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add 'ed' step to mysql-to-postgres procedureJacob Vosmaer2015-07-131-0/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'project-default-view' into 'master'Dmitriy Zaporozhets2015-07-1413-39/+82
|\ \ \ \ \
| * | | | | Allow user to specify content he wants to see on project pageproject-default-viewDmitriy Zaporozhets2015-07-1313-39/+82
* | | | | | Merge branch 'project-plus-icon' into 'master'Dmitriy Zaporozhets2015-07-132-3/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Improve project new item dropdownproject-plus-iconDmitriy Zaporozhets2015-07-132-3/+2
|/ / / / /
* | | | | Merge branch 'use_password_field_defaults_for_services' into 'master'Dmitriy Zaporozhets2015-07-132-12/+2
|\ \ \ \ \
| * | | | | Use password field default password masking.use_password_field_defaults_for_servicesMarin Jankovski2015-07-132-12/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'project-dropdown' into 'master'Dmitriy Zaporozhets2015-07-132-0/+34
|\ \ \ \ \
| * | | | | Better wording for project dropdownDmitriy Zaporozhets2015-07-131-3/+2
| * | | | | Add dropdown to quickly create issue or branch from project pageDmitriy Zaporozhets2015-07-132-0/+35
| | |/ / / | |/| | |
* | | | | Merge branch 'scroll-sidebar' into 'master'Dmitriy Zaporozhets2015-07-132-9/+7
|\ \ \ \ \
| * | | | | Increase padding between menu items a bitDmitriy Zaporozhets2015-07-131-1/+1
| * | | | | Make sidebar scrollable. It prevents content overflow for small screensDmitriy Zaporozhets2015-07-132-8/+6
| |/ / / /