Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Search for 'div-dropzone' correctlyfix_selecting_them_upload | Robert Schilling | 2014-10-01 | 7 | -7/+7 |
| | |||||
* | Disable dropzone in ZEN mode | Robert Schilling | 2014-10-01 | 1 | -0/+4 |
| | |||||
* | Fix attachment upload link bug caused by introduction of zen mode. | Marin Jankovski | 2014-09-30 | 1 | -11/+11 |
| | |||||
* | Bump gitlab_git | Dmitriy Zaporozhets | 2014-09-30 | 2 | -3/+3 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Add rspec to test_ci | Dmitriy Zaporozhets | 2014-09-30 | 1 | -1/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Separate rake test for simplecov | Dmitriy Zaporozhets | 2014-09-30 | 1 | -0/+7 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-09-30 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'speed-upgrade' into 'master' | Marin Jankovski | 2014-09-30 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Speed upgrade /cc @jacobvosmaer @dzaporozhets See merge request !1134 | ||||
| | * | Rename the speed upgrade file. | Sytse Sijbrandij | 2014-09-30 | 1 | -0/+0 |
| | | | |||||
| | * | Remove notice that it hasn't been released yet. | Sytse Sijbrandij | 2014-09-30 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Marin Jankovski | 2014-09-30 | 1 | -2/+12 |
| |\ \ | |||||
* | \ \ | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-30 | 1 | -2/+12 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge pull request #7906 from mr-vinn/fix-graph-log | Dmitriy Zaporozhets | 2014-09-30 | 1 | -2/+12 |
| |\ \ | | | | | | | | | Replace Gitlab::Git::GitStats | ||||
| | * | | Replace Gitlab::Git::GitStats | Vinnie Okada | 2014-09-29 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | | | | | The `GitStats` class has been removed from gitlab_git, so parse commits directly in `Repository#graph_log`. | ||||
* | | | | Merge branch 'backup_uploader_docs' into 'master' | Dmitriy Zaporozhets | 2014-09-30 | 2 | -25/+13 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Improve backup uploader docs See merge request !1137 | ||||
| * | | | Add region to backup upload config in gitlab.yml | Jacob Vosmaer | 2014-09-30 | 1 | -0/+1 |
| | | | | |||||
| * | | | Consolidate the IAM backup upload policy | Jacob Vosmaer | 2014-09-30 | 1 | -25/+10 |
| | | | | |||||
| * | | | Add a 'region' to the backup upload connection | Jacob Vosmaer | 2014-09-30 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge branch 'jubianchi-api/issues-filter-milestone' | Dmitriy Zaporozhets | 2014-09-30 | 4 | -9/+74 |
|\ \ \ | |||||
| * \ \ | Merge branch 'api/issues-filter-milestone' of ↵ | Dmitriy Zaporozhets | 2014-09-30 | 4 | -9/+74 |
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/jubianchi/gitlabhq into jubianchi-api/issues-filter-milestone Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| * | | | Filters issues by milestone via API | jubianchi | 2014-09-26 | 4 | -9/+74 |
| | | | | |||||
* | | | | Merge branch 'fix-network-graph' into 'master' | Dmitriy Zaporozhets | 2014-09-30 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix network graph Fix #1624 See merge request !1135 | ||||
| * | | | | Bump gitlab_git version | Dmitriy Zaporozhets | 2014-09-30 | 2 | -3/+3 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch 'prevent_notes_polling' into 'master' | Dmitriy Zaporozhets | 2014-09-30 | 2 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent notes polling when there are not notes See merge request !1132 | ||||
| * | | | | Prevent notes polling when there are not notes | Jacob Vosmaer | 2014-09-29 | 2 | -1/+4 |
| | | | | | |||||
* | | | | | Fix contributors api | Dmitriy Zaporozhets | 2014-09-30 | 2 | -8/+6 |
| |/ / / |/| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge pull request #7870 from mr-vinn/fix-notify-spec | Robert Schilling | 2014-09-30 | 1 | -2/+7 |
|\ \ \ \ | | | | | | | | | | | Update expected value in notify_spec | ||||
| * | | | | Update expected value in notify_spec | Vinnie Okada | 2014-09-26 | 1 | -2/+7 |
| | |/ / | |/| | | | | | | | | | | | | | | Prevent test failures when Gitlab is configured to use a port other than 80. | ||||
* | | | | Merge pull request #7889 from cirosantilli/rm-def-project | Robert Schilling | 2014-09-30 | 6 | -24/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Remove def project from tests that inherit it. | ||||
| * | | | Remove def project from tests that inherit it. | Ciro Santilli | 2014-09-28 | 6 | -24/+0 |
| | | | | |||||
* | | | | Merge pull request #7873 from cirosantilli/testme-to-gitlabtest | Dmitriy Zaporozhets | 2014-09-29 | 2 | -6/+15 |
|\ \ \ \ | |_|_|/ |/| | | | Replace testme with gitlab-test. | ||||
| * | | | Replace testme with gitlab-test. | Ciro Santilli | 2014-09-27 | 2 | -6/+15 |
| | |/ | |/| | |||||
* | | | Merge branch 'backup-uploader' | Dmitriy Zaporozhets | 2014-09-29 | 6 | -4/+139 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| * | | | Add backup upload support to the rake task | Jacob Vosmaer | 2014-09-29 | 6 | -4/+139 |
| | | | | |||||
* | | | | Merge branch 'protect_default_branch_by_default' into 'master' | Dmitriy Zaporozhets | 2014-09-29 | 3 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect default branch by default Fixes #1543 See merge request !1130 | ||||
| * | | | | Add a simple spec test. | Marin Jankovski | 2014-09-29 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Protect default branch by default. | Marin Jankovski | 2014-09-29 | 2 | -0/+3 |
| | | | | | |||||
* | | | | | Merge branch 'keep_repositories_directory' into 'master' | Dmitriy Zaporozhets | 2014-09-29 | 2 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep repositories directory See merge request !1131 | ||||
| * | | | | | Keep tmp/repositories during clean-up | Jacob Vosmaer | 2014-09-29 | 2 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2014-09-29 | 3 | -7/+39 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'faster-branch-contains' into 'master' | Dmitriy Zaporozhets | 2014-09-29 | 3 | -7/+39 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Faster branch contains detection for commit Much faster then iterate over all branches in rugged and look for existing commit See merge request !1129 | ||||
| | * | | | | | Add specs for Repository#last_commit_for_path | Dmitriy Zaporozhets | 2014-09-29 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | Faster branch contains detection for commit | Dmitriy Zaporozhets | 2014-09-29 | 3 | -7/+33 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Fix download repo featire | Dmitriy Zaporozhets | 2014-09-29 | 2 | -3/+3 |
|/ / / / / | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-29 | 5 | -23/+142 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #7897 from cirosantilli/predictable-merge-requests-dev-seed | Dmitriy Zaporozhets | 2014-09-29 | 1 | -0/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add predictable merge requests on dev seed. | ||||
| | * | | | | | Add predictable merge requests on dev seed. | Ciro Santilli | 2014-09-29 | 1 | -0/+18 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #7895 from cirosantilli/quiet-admin-dev-seed | Dmitriy Zaporozhets | 2014-09-29 | 1 | -10/+12 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Prevent email sending on admin dev seed. | ||||
| | * | | | | | | Prevent email sending on admin dev seed. | Ciro Santilli | 2014-09-29 | 1 | -10/+12 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #7898 from cirosantilli/hide-wrap-text-mr-binary | Dmitriy Zaporozhets | 2014-09-29 | 1 | -9/+10 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Only show text wrap and diff notes for text in merge requests. |