summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Version 7.3.rc1.v7.3.0.rc1Marin Jankovski2014-09-171-1/+1
* Updates to the update/install docs for 7.3.rc1Marin Jankovski2014-09-173-24/+158
* Highlight the word master when referring to a branch name to make it more obv...Sytse Sijbrandij2014-09-171-1/+1
* Merge branch 'doc/welcome_message' into 'master'Job van der Voort2014-09-172-0/+35
|\
| * Document the extra.sign_in_text setting for CEJacob Vosmaer2014-08-202-0/+35
* | Merge branch 'gitlab_check_hooks_symlink' into 'master'Dmitriy Zaporozhets2014-09-161-62/+17
|\ \
| * | Check for hooks directory symlink in gitlab:checkJacob Vosmaer2014-09-161-62/+17
* | | Merge branch 'dont-rebase-pushed-commits' into 'master'Dmitriy Zaporozhets2014-09-161-2/+2
|\ \ \
| * | | Don't rebase pushed commits.Sytse Sijbrandij2014-09-161-2/+2
|/ / /
* | | Merge branch 'new_relic' into 'master'Dmitriy Zaporozhets2014-09-164-0/+21
|\ \ \ | |/ / |/| |
| * | Add dormant New Relic gemJacob Vosmaer2014-09-164-0/+21
|/ /
* | Merge branch 'order_mr_api' into 'master'Marin Jankovski2014-09-164-0/+73
|\ \
| * | Fix typo in comment.Marin Jankovski2014-09-161-1/+1
| * | Different created_at and updated_at time in api merge_requests spec.Marin Jankovski2014-09-151-31/+55
| * | Ordering and sorting for MR in api.Marin Jankovski2014-09-154-0/+49
* | | Merge branch 'redis_socket' into 'master'Dmitriy Zaporozhets2014-09-154-4/+46
|\ \ \ | |/ / |/| |
| * | Use sockets to connect to RedisJacob Vosmaer2014-09-124-4/+46
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-152-5/+5
|\ \ \
| * \ \ Merge pull request #7753 from tamers/patch-1Robert Schilling2014-09-141-1/+1
| |\ \ \
| | * | | Fix grammatical error in 'not merged changes' msgTamer Sherif2014-09-141-1/+1
| |/ / /
| * | | Merge pull request #7528 from exromany/patch-1Robert Schilling2014-09-131-4/+4
| |\ \ \
| | * | | move env to end of linesexromany2014-08-191-4/+4
| | * | | Update user_management.mdexromany2014-08-181-4/+4
* | | | | Merge branch 'implement_comments_on_parallel_diff' into 'master'Dmitriy Zaporozhets2014-09-157-48/+105
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix diff_helper spec.Marin Jankovski2014-09-121-26/+27
| * | | | Add one feature test.Marin Jankovski2014-09-122-0/+20
| * | | | Move organizing of comments to helper.Marin Jankovski2014-09-122-14/+22
| * | | | Remove unecesarry array operations.Marin Jankovski2014-09-123-17/+16
| * | | | Add comments on the side-by-side diff.Marin Jankovski2014-09-124-15/+44
* | | | | Merge pull request #7749 from wesgurn/masterDmitriy Zaporozhets2014-09-134-3/+9
|\ \ \ \ \
| * | | | | Adding ability to configure webhook timeout via gitlab.ymlWes Gurney2014-09-124-3/+9
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-09-122-14/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #7741 from Razer6/refactor/remove_duplicate_stepsMarin Jankovski2014-09-122-14/+8
| |\ \ \ \ \ \
| | * | | | | | Remove duplicated labels stepRobert Schilling2014-09-122-14/+8
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2014-09-123-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge pull request #7743 from bbodenmiller/patch-12Robert Schilling2014-09-121-2/+2
| |\ \ \ \ \ \
| | * | | | | | formatting changes, table->databaseBen Bodenmiller2014-09-121-2/+2
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #7712 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-122-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | fail_timeout=0 as recommended by UnicornBen Bodenmiller2014-09-122-2/+2
* | | | | | | Merge branch 'backlog_socket' into 'master'Dmitriy Zaporozhets2014-09-122-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use the default Unicorn socket backlog value: 1024Jacob Vosmaer2014-09-122-3/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #7662 from Razer6/disable_buttons_on_empty_formDmitriy Zaporozhets2014-09-123-7/+12
|\ \ \ \ \ \
| * | | | | | Disable buttons if required forms are emptyRobert Schilling2014-09-113-7/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #7522 from Razer6/fix_tags_countDmitriy Zaporozhets2014-09-126-14/+56
|\ \ \ \ \ \
| * | | | | | update tags count if tag gets deletedRobert Schilling2014-09-126-14/+56
| |/ / / / /
* | | | | | Merge pull request #7439 from bbodenmiller/patch-6Robert Schilling2014-09-121-0/+4
|\ \ \ \ \ \
| * | | | | | set the number of workers to # of coresBen Bodenmiller2014-09-121-0/+4
* | | | | | | Merge pull request #7713 from bbodenmiller/patch-5Sytse Sijbrandij2014-09-121-0/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | add requests linkBen Bodenmiller2014-09-121-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #7737 from Razer6/feature/zenmasterDmitriy Zaporozhets2014-09-129-8/+216
|\ \ \ \ \ \