summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add files to path blacklist.Jason Hollingsworth2014-01-244-12/+1
* Merge branch 'reference_relative_links' into 'master'Dmitriy Zaporozhets2014-01-247-11/+82
|\
| * Merge branch 'master' into reference_relative_linksMarin Jankovski2014-01-24137-569/+720
| |\
| * | Use the correct paths.Marin Jankovski2014-01-233-3/+3
| * | Update last sha of the commit in the test seed repository.Marin Jankovski2014-01-232-4/+4
| * | Test if the views behave correctly with reference style relative links.Marin Jankovski2014-01-233-0/+34
| * | Markdown helper spec for reference style relative links.Marin Jankovski2014-01-231-0/+18
| * | Display correct paths in markdown for reference style links.Marin Jankovski2014-01-221-6/+25
* | | Merge branch 'improve/developer_permissions' into 'master'Dmitriy Zaporozhets2014-01-248-2/+16
|\ \ \
| * | | Improve authorization for new/edit blob pagesDmitriy Zaporozhets2014-01-244-1/+4
| * | | Allow developers to mange issue trackerDmitriy Zaporozhets2014-01-244-1/+12
|/ / /
* | | Merge branch 'improve/mr_service' into 'master'Dmitriy Zaporozhets2014-01-246-32/+93
|\ \ \ | |_|/ |/| |
| * | Fix mr update issue if merge_request_diff missingDmitriy Zaporozhets2014-01-241-1/+3
| * | MergeRequests servicesDmitriy Zaporozhets2014-01-246-31/+90
|/ /
* | Merge branch 'report_backup_db_success' into 'master'Dmitriy Zaporozhets2014-01-241-2/+16
|\ \
| * | Report failure of DB backup commandsJacob Vosmaer2014-01-231-2/+16
* | | Merge branch 'development_seed_fix' into 'master'Dmitriy Zaporozhets2014-01-241-1/+1
|\ \ \
| * | | Replace context with service in development seed data.Marin Jankovski2014-01-231-1/+1
| |/ /
* | | Merge branch 'ssh-docs' into 'master'Dmitriy Zaporozhets2014-01-241-2/+13
|\ \ \
| * | | Split into one sentence per line for future edits.dosire2014-01-231-3/+8
| * | | Better ssh key docs.dosire2014-01-231-2/+8
| |/ /
* | | Merge branch 'oudated-version-headers' into 'master'Dmitriy Zaporozhets2014-01-242-2/+0
|\ \ \
| * | | Remove version since we don't keep it up to date.dosire2014-01-232-2/+0
* | | | Merge branch 'release-procedure' into 'master'Dmitriy Zaporozhets2014-01-241-6/+7
|\ \ \ \
| * | | | Do not branch from master until release is done.dosire2014-01-241-6/+7
* | | | | Merge branch 'jira-integration' into 'master'Dmitriy Zaporozhets2014-01-242-0/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Need ! to embed.dosire2014-01-241-1/+1
| * | | | Embed screenshot.dosire2014-01-241-1/+1
| * | | | Jira integration documentation.dosire2014-01-242-0/+7
|/ / / /
* | | | Merge pull request #6142 from gdamjan/masterDmitriy Zaporozhets2014-01-231-1/+1
|\ \ \ \
| * | | | Check specifically for Unicorn in rack config.ru fileДамјан Георгиевски2014-01-231-1/+1
| |/ / /
* | | | Merge pull request #6149 from carlosparamio/assembla_hardcoded_project_nameDmitriy Zaporozhets2014-01-232-5/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Project name was hardcoded (oops)Carlos Paramio2014-01-242-5/+9
|/ / /
* | | Merge pull request #6131 from dblessing/fix/mobile_ui_loginDmitriy Zaporozhets2014-01-231-3/+2
|\ \ \
| * | | Enhance responsive UI for the login screen.Drew Blessing2014-01-221-3/+2
* | | | Merge branch 'improve/mr_diff'Dmitriy Zaporozhets2014-01-2361-386/+492
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix project model specDmitriy Zaporozhets2014-01-231-2/+2
| * | | Fix testsDmitriy Zaporozhets2014-01-232-5/+4
| * | | Fix mr specsDmitriy Zaporozhets2014-01-231-4/+3
| * | | Fix satellites specsDmitriy Zaporozhets2014-01-231-2/+3
| * | | fix tests notes_on_merge_requestsDmitriy Zaporozhets2014-01-231-17/+8
| * | | Fix public testsDmitriy Zaporozhets2014-01-231-1/+1
| * | | Fix project team testsDmitriy Zaporozhets2014-01-231-1/+1
| * | | Fix MR spinach testsDmitriy Zaporozhets2014-01-237-28/+74
| * | | Fix api merge request specsDmitriy Zaporozhets2014-01-221-17/+16
| * | | Make changes to testsDmitriy Zaporozhets2014-01-2243-131/+109
| * | | Always create merge_request_diff if MR createdDmitriy Zaporozhets2014-01-224-3/+2
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into improve/mr_diffDmitriy Zaporozhets2014-01-221-6/+6
| |\ \ \
| * | | | Improve commit render performnace for MR show pageDmitriy Zaporozhets2014-01-224-19/+18
| * | | | Set mr_diff state to collected if diff is okDmitriy Zaporozhets2014-01-221-1/+4