summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* update API docproject_api_orderValery Sizov2015-05-141-0/+3
* Add order option for projects APIValery Sizov2015-05-142-1/+15
* Merge branch 'note-action-icons' into 'master'Dmitriy Zaporozhets2015-05-143-29/+29
|\
| * Always show note action icons.Douwe Maan2015-05-143-29/+29
|/
* Merge branch 'upgrade-dockerfile-apt' into 'master'Sytse Sijbrandij2015-05-142-15/+12
|\
| * Use apt repositories to upgrade Docker builds to the latest GitLab versionStan Hu2015-05-132-15/+12
* | GitLab shell version to 2.6.3.Marin Jankovski2015-05-141-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-05-141-1/+1
|\ \ | |/
| * Merge requests are welcome in spite of the deprecation.Sytse Sijbrandij2015-05-131-1/+1
* | Merge branch 'sidekiq-sigkill' into 'master'Dmitriy Zaporozhets2015-05-132-1/+2
|\ \ | |/ |/|
| * Use SIGKILL by default in Sidekiq::MemoryKillerJacob Vosmaer2015-05-132-1/+2
|/
* Fix text overflow in project sidebarDmitriy Zaporozhets2015-05-131-0/+4
* Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-1314-84/+98
|\
| * Fix GitAccess.text-batch-1Douwe Maan2015-05-132-13/+6
| * Fix 422 error page.Douwe Maan2015-05-131-1/+1
| * Improve OAuth application flash messages.Douwe Maan2015-05-131-5/+5
| * Improve OAuth signup error message.Douwe Maan2015-05-132-4/+11
| * Improve description of branch protection levels.Douwe Maan2015-05-131-3/+3
| * Improve Git access error messages.Douwe Maan2015-05-133-45/+44
| * Improve text on error pages.Douwe Maan2015-05-136-17/+32
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-131-6/+15
|\ \
| * | remove strange code branchetsSytse Sijbrandij2015-05-131-1/+1
| * | Deprecate the upgrader script since we forget to update it.Sytse Sijbrandij2015-05-131-5/+14
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-1310-221/+275
|\ \ \
| * \ \ Merge pull request #9276 from jirutka/relative_link_filterDmitriy Zaporozhets2015-05-136-218/+242
| |\ \ \
| | * | | Add spec for RelativeLinkFilterJakub Jirutka2015-05-122-73/+120
| | * | | RelativeLinkFilter: refactor according to suggestions by @tsigoJakub Jirutka2015-05-112-17/+13
| | * | | Extract handling of relative file links to RelativeLinkFilterJakub Jirutka2015-05-114-145/+126
| * | | | Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commitJeroen van Baarsen2015-05-134-3/+33
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Call merge request web hook for each commitsArthur Gautier2015-05-134-3/+33
* | | | | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-139-10/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable version check only for production environmentDmitriy Zaporozhets2015-05-111-1/+3
| * | | | Replace host with real oneDmitriy Zaporozhets2015-05-111-2/+1
| * | | | Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| * | | | Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-089-10/+45
| |\ \ \ \
| | * | | | Remove unnecessary public keyDmitriy Zaporozhets2015-05-082-9/+1
| | * | | | Remove encryptionDmitriy Zaporozhets2015-05-084-24/+7
| | * | | | Add feature to disable version checkDmitriy Zaporozhets2015-03-106-5/+20
| | * | | | Add version check to help page tooDmitriy Zaporozhets2015-03-091-0/+1
| | * | | | Prevent crash if file does not existsDmitriy Zaporozhets2015-03-091-1/+3
| | * | | | Add version check badge to admin areaDmitriy Zaporozhets2015-03-093-1/+40
| | * | | | Add simple_encrypt gemDmitriy Zaporozhets2015-03-092-0/+3
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-05-131-5/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'code-defreeze' into 'master'Marin Jankovski2015-05-131-5/+0
| |\ \ \ \ \ \
| | * | | | | | defreeze codeJob van der Voort2015-05-111-5/+0
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-05-137-4/+57
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-127-4/+57
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge branch 'fix-avatar-removal' into 'master'Hannes Rosenögger2015-05-127-4/+57
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix bug where avatar filenames were not actually deleted from the database du...Stan Hu2015-05-077-5/+57
* | | | | | | Merge branch 'remove-outdated-gif' into 'master'Sytse Sijbrandij2015-05-121-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |