summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add note about semantic versioning not being absolute.relative-sematic-versioningSytse Sijbrandij2015-01-101-1/+1
* Merge branch 'flatten-dirs' into 'master'Dmitriy Zaporozhets2015-01-113-1/+40
|\
| * point to a specific branch in the test repo to avoid conflictsmarmis852015-01-112-2/+2
| * updated master to latests shamarmis852015-01-111-1/+1
| * Add test spec for TreeHelper modulemarmis852015-01-101-0/+28
| * Flatten the directory hierarchy while there is only one directory descendantmarmis852014-12-312-1/+12
* | Merge branch 'release-doc' into 'master'Dmitriy Zaporozhets2015-01-111-18/+19
|\ \
| * | Small spelling improvements.Sytse Sijbrandij2015-01-101-18/+19
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-102-210/+207
|\ \ \ | |/ /
| * | Merge branch 'refactor-release-doc' into 'master'Sytse Sijbrandij2015-01-112-210/+207
| |\ \
| | * | Make ordered lists for release docDmitriy Zaporozhets2015-01-111-19/+19
| | * | Replace befor with beforeDmitriy Zaporozhets2015-01-111-7/+7
| | * | Improve monthly.md with fixes proposed from SytseDmitriy Zaporozhets2015-01-101-21/+27
| | * | Improve monthly.md with fixes proposed from SytseDmitriy Zaporozhets2015-01-101-27/+21
| | * | Improve monthly.md with fixes proposed from @sytseDmitriy Zaporozhets2015-01-101-21/+27
| | * | Cleanup and refactor release doc. Follow issue as a todo listDmitriy Zaporozhets2015-01-092-199/+190
* | | | If noteable is nil - make discussion outdatedDmitriy Zaporozhets2015-01-101-0/+1
|/ / /
* | | Merge branch 'easy-dev-install' into 'master'Dmitriy Zaporozhets2015-01-111-1/+1
|\ \ \
| * | | Require the ruby racer only in production since installing it on dev machines...easy-dev-installSytse Sijbrandij2014-12-151-1/+1
* | | | Merge branch 'async-satellites' into 'master'Dmitriy Zaporozhets2015-01-105-6/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Make automerge via satelliteDmitriy Zaporozhets2015-01-095-6/+32
|/ / /
* | | Rescue missing database errorsJacob Vosmaer2015-01-091-4/+8
* | | Merge branch 'popen_close_stdin'Dmitriy Zaporozhets2015-01-082-0/+4
|\ \ \
| * | | Close standard input in Gitlab::Popen.popenJacob Vosmaer2015-01-052-0/+4
* | | | Update CHANGELOGDmitriy Zaporozhets2015-01-081-0/+17
* | | | Merge branch 'app-settings' into 'master'Dmitriy Zaporozhets2015-01-0829-32/+230
|\ \ \ \
| * | | | Finally fix stuff related to dynamic configDmitriy Zaporozhets2015-01-085-8/+12
| * | | | Fix feature and testsDmitriy Zaporozhets2015-01-084-7/+5
| * | | | Create ApplicationSettings if does not exist in runtimeDmitriy Zaporozhets2015-01-084-20/+24
| * | | | Hack for migrating to new settingsDmitriy Zaporozhets2015-01-082-3/+12
| * | | | Improve application settings and write testsDmitriy Zaporozhets2015-01-0820-77/+123
| * | | | Init ApplicationSettings resource with defaults from config fileDmitriy Zaporozhets2015-01-0815-7/+144
|/ / / /
* | | | Redesign signin/singup pagesDmitriy Zaporozhets2015-01-0710-107/+148
* | | | GitLab does not work well with Ruby 2.2 yetDmitriy Zaporozhets2015-01-071-1/+1
* | | | Merge branch 'update_api_messages' into 'master'Dmitriy Zaporozhets2015-01-0716-25/+28
|\ \ \ \
| * \ \ \ Merge branch 'master' into update_api_messagesMarin Jankovski2015-01-0752-392/+528
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-01-061-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge pull request #8503 from cirosantilli/unused-ex-varDmitriy Zaporozhets2015-01-061-1/+1
| |\ \ \ \ \
| | * | | | | Remove unused ex local variable from event.rbCiro Santilli2014-12-291-1/+1
* | | | | | | Merge branch 'merge-system-note' into 'master'Dmitriy Zaporozhets2015-01-076-24/+19
|\ \ \ \ \ \ \
| * | | | | | | Improve mr refresh service testsDmitriy Zaporozhets2015-01-061-4/+4
| * | | | | | | Ooops! Removing debug line :)Dmitriy Zaporozhets2015-01-061-1/+0
| * | | | | | | Refactor merge request merge serviceDmitriy Zaporozhets2015-01-065-20/+16
* | | | | | | | Merge branch 'fix-commits-link-mr' into 'master'Dmitriy Zaporozhets2015-01-074-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Pass source project variable to commits list on MR pageDmitriy Zaporozhets2015-01-064-4/+4
|/ / / / / /
* | | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-01-0610-199/+209
|\ \ \ \ \ \
| * | | | | | Restyle and refactor dashboard projects page filteringDmitriy Zaporozhets2015-01-063-114/+139
| * | | | | | Restyle and refactor milestones filterDmitriy Zaporozhets2015-01-067-85/+70
|/ / / / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-01-064-8/+23
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'event-last-push-styling-fix' into 'master'Dmitriy Zaporozhets2015-01-061-1/+5
| |\ \ \ \ \ \