summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync master branch before releasing rcDmitriy Zaporozhets2014-11-111-0/+7
* Merge branch 'fix-deleted-fork' into 'master'Dmitriy Zaporozhets2014-11-114-94/+167
|\
| * Refactor merge request refresh logic on pushDmitriy Zaporozhets2014-11-114-94/+167
| * Prevent post-receive error when push to project with dead forksDmitriy Zaporozhets2014-11-111-3/+3
* | Merge pull request #7944 from cirosantilli/new-blob-commit-belowDmitriy Zaporozhets2014-11-111-2/+2
|\ \
| * | Move new blob commit message textarea below editorCiro Santilli2014-10-131-2/+2
* | | Merge branch 'doc-release-tools' into 'master'Dmitriy Zaporozhets2014-11-112-65/+50
|\ \ \
| * | | Add tip about EE and CE master synced before release rc1Dmitriy Zaporozhets2014-11-111-0/+2
| * | | Use release tools in patch releaseDmitriy Zaporozhets2014-11-111-4/+27
| * | | Use release tool for monthly releasesDmitriy Zaporozhets2014-11-111-62/+22
| | |/ | |/|
* | | Merge branch '7-4-stable'Valery Sizov2014-11-111-0/+5
|\ \ \ | |/ / |/| |
| * | Merge branch '7-4-stable' of github.com:gitlabhq/gitlabhq into 7-4-stableDmitriy Zaporozhets2014-10-301-0/+1
| |\ \
| | * \ Merge pull request #8162 from jmsche/patch-1Robert Schilling2014-10-251-0/+1
| | |\ \
| | | * | Fixed missing end-of-code line in 7.4 upgrade docjmsche2014-10-241-0/+1
| | |/ /
| * | | Add addressable explicitly to Gemfilev7.4.3Dmitriy Zaporozhets2014-10-302-0/+2
| * | | update changelogValery Sizov2014-10-291-0/+1
| * | | Explicitly require addressable gem feature you need. Fixes Buildbox CI integr...Dmitriy Zaporozhets2014-10-291-0/+2
| * | | Fix raw view for public snippetsValery Sizov2014-10-293-1/+14
| * | | Dont allow guests..developers to manage group membersDmitriy Zaporozhets2014-10-292-5/+17
| * | | Split group members apiDmitriy Zaporozhets2014-10-295-175/+205
| * | | Add failing test that should be green after group members api get fixedDmitriy Zaporozhets2014-10-291-3/+17
| * | | update changelog && bump versionValery Sizov2014-10-292-1/+5
| |/ /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-11-114-10/+4
|\ \ \
| * \ \ Merge branch 'remove_unused_javascript' into 'master'Dmitriy Zaporozhets2014-11-103-7/+1
| |\ \ \
| | * | | remove unused jsskv2014-11-063-7/+1
| * | | | Merge branch 'better-mr-instructions' into 'master'Dmitriy Zaporozhets2014-11-101-3/+3
| |\ \ \ \
| | * | | | Instruct users to fetch merge request branchJohann MacDonagh2014-02-081-3/+3
* | | | | | Merge branch 'automate-upgrader-shell-version' into 'master'Dmitriy Zaporozhets2014-11-111-7/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make GitLab Shell upgrade a natural part of the upgrade process.Sytse Sijbrandij2014-11-021-7/+10
* | | | | | Revert "Create dev fixture projects with fixed visibility"Dmitriy Zaporozhets2014-11-105-96/+50
* | | | | | Revert "Version 7.6.0.rc1"Dmitriy Zaporozhets2014-11-101-1/+1
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-11-102-2/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #8107 from bbodenmiller/patch-16Dmitriy Zaporozhets2014-11-102-2/+3
| |\ \ \ \ \ \
| | * | | | | | make repo name link to repo homepageBen Bodenmiller2014-11-092-2/+3
* | | | | | | | Version 7.6.0.rc1Dmitriy Zaporozhets2014-11-101-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #8273 from bbodenmiller/nginx-updatesMarin Jankovski2014-11-102-16/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | minor updates & formatting changesBen Bodenmiller2014-11-082-16/+15
* | | | | | | Merge pull request #8254 from cirosantilli/factor-get-shell-versionDmitriy Zaporozhets2014-11-083-8/+11
|\ \ \ \ \ \ \
| * | | | | | | Factor GITLAB_SHELL_VERSION get methodCiro Santilli2014-11-053-8/+11
* | | | | | | | Merge branch 'nginx' into 'master'Marin Jankovski2014-11-072-3/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't enable IPv4 *only* on nginx.Hugo Osvaldo Barrera2014-11-032-3/+6
* | | | | | | | | Merge pull request #8168 from cirosantilli/dev-fixtures-visibilityMarin Jankovski2014-11-075-50/+96
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Create dev fixture projects with fixed visibilityCiro Santilli2014-10-265-50/+96
* | | | | | | | | | Merge pull request #8246 from dluchinienoc/masterMarin Jankovski2014-11-071-6/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unnecessary lines.Don Luchini2014-11-051-2/+0
| * | | | | | | | | | Do not require immediate password reset if specifying one when seeding database.Don Luchini2014-11-041-6/+10
* | | | | | | | | | | Merge branch 'fix-attachment-ui' into 'master'Dmitriy Zaporozhets2014-11-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Fix attachment misaligned in commentDmitriy Zaporozhets2014-11-071-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'improve-white-code-highlight' into 'master'Dmitriy Zaporozhets2014-11-061-0/+8
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into improve-white-code-highlightDmitriy Zaporozhets2014-11-0610-52/+23
| |\ \ \ \ \ \ \ \ \ \