summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix label color input.fix-label-color-inputDouwe Maan2015-04-172-1/+3
* Merge branch 'google-code-changelog' into 'master'Dmitriy Zaporozhets2015-04-171-0/+1
|\
| * Add Google Code importer to changelog.Douwe Maan2015-04-171-0/+1
|/
* Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-179-77/+106
|\
| * Decrease memory use and increase performance of Google Code importer.Douwe Maan2015-04-171-47/+38
| * Move import data out of project so it doesn't take ages to load.Douwe Maan2015-04-178-30/+63
| * Don't save unchanged user map items to the DB.Douwe Maan2015-04-171-0/+5
* | Merge branch 'gitlab_git-7.1.9' into 'master'Dmitriy Zaporozhets2015-04-173-3/+4
|\ \
| * | Update gitlab_git to ignore invalid lines in .gitmodules.gitlab_git-7.1.9Douwe Maan2015-04-173-3/+4
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-172-5/+6
|\ \
| * \ Merge branch 'fix-username-period-migration' into 'master'Dmitriy Zaporozhets2015-04-172-5/+6
| |\ \ | | |/ | |/|
| | * Fix username period migration to preserve uniqueness of names and paths.Douwe Maan2015-04-172-5/+6
| |/
* | Merge branch 'repo-check-task' into 'master'Dmitriy Zaporozhets2015-04-172-0/+18
|\ \ | |/ |/|
| * Add new rake taskVinnie Okada2015-04-152-0/+18
* | Merge pull request #8212 from dmedvinsky/fix-url-fieldMarin Jankovski2015-04-173-4/+4
|\ \
| * | Fix auto-selection of URL field with X11 selectionDmitry Medvinsky2015-04-173-4/+4
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-04-171-0/+10
|\ \ \ | |/ /
| * | Merge pull request #9147 from jvanbaarsen/changelof-7-11Dmitriy Zaporozhets2015-04-161-0/+10
| |\ \
| | * | Added changelog for 7.11Jeroen van Baarsen2015-04-161-0/+10
| |/ /
* | | Merge branch 'update-changelog' into 'master'Dmitriy Zaporozhets2015-04-161-0/+5
|\ \ \ | |/ / |/| |
| * | Add 7.9.4 to CHANGELOGupdate-changelogDmitriy Zaporozhets2015-04-161-0/+5
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-164-7/+7
|\ \
| * \ Merge pull request #9131 from chulkilee/ruby-2.1.6Dmitriy Zaporozhets2015-04-163-6/+6
| |\ \
| | * | ruby 2.1.6Chulki Lee2015-04-133-6/+6
| * | | Merge pull request #9094 from bbodenmiller/patch-1Jeroen van Baarsen2015-04-161-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | update text to reference new location of settingBen Bodenmiller2015-04-051-1/+1
* | | | Merge branch 'update-install-guides-710' into 'master'Job van der Voort2015-04-162-13/+13
|\ \ \ \ | |/ / / |/| | |
| * | | update guides for 7.10Job van der Voort2015-04-162-13/+13
|/ / /
* | | Merge pull request #9089 from dsander/fix-merge-request-commentsMarin Jankovski2015-04-155-7/+11
|\ \ \
| * | | Fix merge request comments on files with multiple commitsDominik Sander2015-04-155-7/+11
* | | | Merge branch 'fix-mention-notification' into 'master'Dmitriy Zaporozhets2015-04-151-24/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Fix for snippets.fix-mention-notificationDouwe Maan2015-04-151-2/+4
| * | | Fix Mention notification level.Douwe Maan2015-04-151-24/+13
* | | | Merge branch 'fix-gitorious-test' into 'master'Marin Jankovski2015-04-157-37/+62
|\ \ \ \ | |/ / /
| * | | Make sure user has access to namespace in import tests.Douwe Maan2015-04-157-37/+62
|/ / /
* | | No tabs in code!Dmitriy Zaporozhets2015-04-151-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1578-220/+1246
|\ \ \
| * \ \ Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-154-16/+74
| |\ \ \
| | * | | Simplify regex.sstanovnik-openssh_fixDouwe Maan2015-04-141-3/+3
| | * | | Refactor key fingerprint generation.Douwe Maan2015-04-143-40/+71
| | * | | Add changelog entry.Douwe Maan2015-04-141-0/+1
| | * | | The new fingerprint format wis incompatible with the previous regex.Sašo Stanovnik2015-03-241-4/+11
| | * | | Use 2 spaces for indentation, not 4.Sašo Stanovnik2015-03-241-1/+1
| | * | | Fixed generating SSH key fingerprints in OpenSSH 6.8.Sašo Stanovnik2015-03-241-1/+18
| * | | | Merge branch 'emailsonpush-replyto' into 'master'Dmitriy Zaporozhets2015-04-154-12/+40
| |\ \ \ \
| | * | | | Set EmailsOnPush reply-to address to committer email when enabled.emailsonpush-replytoDouwe Maan2015-04-144-12/+40
| * | | | | Merge branch 'emailsonpush-hellip' into 'master'Dmitriy Zaporozhets2015-04-153-3/+4
| |\ \ \ \ \
| | * | | | | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellipDouwe Maan2015-04-143-3/+4
| * | | | | | Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-157-9/+84
| |\ \ \ \ \ \
| | * | | | | | Clarify config var and add to LDAP docs.ldap-block_auto_created_usersDouwe Maan2015-04-142-1/+8
View Lorry Controller Status