summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Search for 'div-dropzone' correctlyfix_selecting_them_uploadRobert Schilling2014-10-017-7/+7
|
* Disable dropzone in ZEN modeRobert Schilling2014-10-011-0/+4
|
* Fix attachment upload link bug caused by introduction of zen mode.Marin Jankovski2014-09-301-11/+11
|
* Bump gitlab_gitDmitriy Zaporozhets2014-09-302-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add rspec to test_ciDmitriy Zaporozhets2014-09-301-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Separate rake test for simplecovDmitriy Zaporozhets2014-09-301-0/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-09-301-2/+2
|\
| * Merge branch 'speed-upgrade' into 'master'Marin Jankovski2014-09-301-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Speed upgrade /cc @jacobvosmaer @dzaporozhets See merge request !1134
| | * Rename the speed upgrade file.Sytse Sijbrandij2014-09-301-0/+0
| | |
| | * Remove notice that it hasn't been released yet.Sytse Sijbrandij2014-09-301-2/+2
| | |
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-09-301-2/+12
| |\ \
* | \ \ Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-301-2/+12
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge pull request #7906 from mr-vinn/fix-graph-logDmitriy Zaporozhets2014-09-301-2/+12
| |\ \ | | | | | | | | Replace Gitlab::Git::GitStats
| | * | Replace Gitlab::Git::GitStatsVinnie Okada2014-09-291-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 Zaporozhets2014-09-302-25/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Improve backup uploader docs See merge request !1137
| * | | Add region to backup upload config in gitlab.ymlJacob Vosmaer2014-09-301-0/+1
| | | |
| * | | Consolidate the IAM backup upload policyJacob Vosmaer2014-09-301-25/+10
| | | |
| * | | Add a 'region' to the backup upload connectionJacob Vosmaer2014-09-301-0/+2
|/ / /
* | | Merge branch 'jubianchi-api/issues-filter-milestone'Dmitriy Zaporozhets2014-09-304-9/+74
|\ \ \
| * \ \ Merge branch 'api/issues-filter-milestone' of ↵Dmitriy Zaporozhets2014-09-304-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 APIjubianchi2014-09-264-9/+74
| | | |
* | | | Merge branch 'fix-network-graph' into 'master'Dmitriy Zaporozhets2014-09-302-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix network graph Fix #1624 See merge request !1135
| * | | | Bump gitlab_git versionDmitriy Zaporozhets2014-09-302-3/+3
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'prevent_notes_polling' into 'master'Dmitriy Zaporozhets2014-09-302-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prevent notes polling when there are not notes See merge request !1132
| * | | | Prevent notes polling when there are not notesJacob Vosmaer2014-09-292-1/+4
| | | | |
* | | | | Fix contributors apiDmitriy Zaporozhets2014-09-302-8/+6
| |/ / / |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #7870 from mr-vinn/fix-notify-specRobert Schilling2014-09-301-2/+7
|\ \ \ \ | | | | | | | | | | Update expected value in notify_spec
| * | | | Update expected value in notify_specVinnie Okada2014-09-261-2/+7
| | |/ / | |/| | | | | | | | | | | | | | Prevent test failures when Gitlab is configured to use a port other than 80.
* | | | Merge pull request #7889 from cirosantilli/rm-def-projectRobert Schilling2014-09-306-24/+0
|\ \ \ \ | |_|_|/ |/| | | Remove def project from tests that inherit it.
| * | | Remove def project from tests that inherit it.Ciro Santilli2014-09-286-24/+0
| | | |
* | | | Merge pull request #7873 from cirosantilli/testme-to-gitlabtestDmitriy Zaporozhets2014-09-292-6/+15
|\ \ \ \ | |_|_|/ |/| | | Replace testme with gitlab-test.
| * | | Replace testme with gitlab-test.Ciro Santilli2014-09-272-6/+15
| | |/ | |/|
* | | Merge branch 'backup-uploader'Dmitriy Zaporozhets2014-09-296-4/+139
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | Add backup upload support to the rake taskJacob Vosmaer2014-09-296-4/+139
| | | |
* | | | Merge branch 'protect_default_branch_by_default' into 'master'Dmitriy Zaporozhets2014-09-293-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect default branch by default Fixes #1543 See merge request !1130
| * | | | Add a simple spec test.Marin Jankovski2014-09-291-0/+2
| | | | |
| * | | | Protect default branch by default.Marin Jankovski2014-09-292-0/+3
| | | | |
* | | | | Merge branch 'keep_repositories_directory' into 'master'Dmitriy Zaporozhets2014-09-292-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep repositories directory See merge request !1131
| * | | | | Keep tmp/repositories during clean-upJacob Vosmaer2014-09-292-1/+3
| | | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-09-293-7/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'faster-branch-contains' into 'master'Dmitriy Zaporozhets2014-09-293-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_pathDmitriy Zaporozhets2014-09-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | Faster branch contains detection for commitDmitriy Zaporozhets2014-09-293-7/+33
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Fix download repo featireDmitriy Zaporozhets2014-09-292-3/+3
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-295-23/+142
|\ \ \ \ \
| * \ \ \ \ Merge pull request #7897 from cirosantilli/predictable-merge-requests-dev-seedDmitriy Zaporozhets2014-09-291-0/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | Add predictable merge requests on dev seed.
| | * | | | | Add predictable merge requests on dev seed.Ciro Santilli2014-09-291-0/+18
| | | | | | |
| * | | | | | Merge pull request #7895 from cirosantilli/quiet-admin-dev-seedDmitriy Zaporozhets2014-09-291-10/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent email sending on admin dev seed.
| | * | | | | | Prevent email sending on admin dev seed.Ciro Santilli2014-09-291-10/+12
| | |/ / / / /
| * | | | | | Merge pull request #7898 from cirosantilli/hide-wrap-text-mr-binaryDmitriy Zaporozhets2014-09-291-9/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Only show text wrap and diff notes for text in merge requests.