summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
| * | | | | | | Light gray bg for white code scheme if used in comments and wikiDmitriy Zaporozhets2014-11-051-0/+8
* | | | | | | | Merge branch 'mentioned_inside_mr' into 'master'Dmitriy Zaporozhets2014-11-062-1/+16
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into mentioned_inside_mrDmitriy Zaporozhets2014-11-0635-54/+67
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Fix tests after change to regex validation message.Marin Jankovski2014-11-052-7/+4
| * | | | | | | | Do not allow cross reference note in a mr if a mr contains mentioned commit.Marin Jankovski2014-11-051-1/+10
| * | | | | | | | Create a failing test where commit in mr creates a mr mention note.Marin Jankovski2014-11-051-0/+6
* | | | | | | | | Merge branch 'fix_system_call' into 'master'Valery Sizov2014-11-063-14/+39
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | fix system silent callValery Sizov2014-11-062-4/+3
| * | | | | | | | Revert "Revert "Don't output to stdout from lib non-interactive methods""Valery Sizov2014-11-063-14/+40
|/ / / / / / / /
* | | | | | | | Revert "Don't output to stdout from lib non-interactive methods"Valery Sizov2014-11-063-40/+14
* | | | | | | | Merge pull request #8258 from cirosantilli/factor-repo-pathDmitriy Zaporozhets2014-11-065-8/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Factor using Repository#path_to_repoCiro Santilli2014-11-055-8/+5
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'gitlab-ci-parallel' into 'master'Dmitriy Zaporozhets2014-11-052-4/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Modify tests to match new gitlab_ci_service logicDmitriy Zaporozhets2014-11-051-2/+2
| * | | | | | | Update GitLab CI service to work with new GitLab CIDmitriy Zaporozhets2014-11-051-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'auth_duplication' into 'master'Dmitriy Zaporozhets2014-11-0514-15/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | remove auth duplicationValery Sizov2014-11-0514-15/+0
* | | | | | | Merge pull request #8094 from cirosantilli/rm-unused-authenticate_userValeriy Sizov2014-11-051-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused authenticate_user from project#showCiro Santilli2014-10-191-2/+0
* | | | | | | | Merge pull request #8233 from cirosantilli/rm-new-branch-deadValeriy Sizov2014-11-052-5/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove dead Event#new_branch? methodCiro Santilli2014-11-032-5/+0
* | | | | | | | | Merge pull request #8236 from cirosantilli/rm-lib-stdoutValeriy Sizov2014-11-053-14/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't output to stdout from lib non-interactive methodsCiro Santilli2014-11-053-14/+40
| |/ / / / / / / /
* | | | | | | | | Merge pull request #8234 from cirosantilli/factor-0000Valeriy Sizov2014-11-055-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Factor '0' * 40 blank ref constantsCiro Santilli2014-11-036-7/+12
| |/ / / / / / / /
* | | | | | | | | Merge pull request #7903 from cirosantilli/test-seed-resetValeriy Sizov2014-11-051-6/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix version of test seed branches.Ciro Santilli2014-10-011-6/+39
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-11-057-7/+12
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #7863 from cirosantilli/rm-blob-link-to-buttonValeriy Sizov2014-11-052-2/+3
| |\ \ \ \ \ \ \ \ \ \