| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update coveralls badge | Dmitriy Zaporozhets | 2014-10-01 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-01 | 3 | -3/+3 |
| |\ | |||||
| | * | Merge pull request #7929 from gitlabhq/improve-coveralls | Dmitriy Zaporozhets | 2014-10-01 | 3 | -3/+3 |
| | |\ | | | | | | | Try wear_merged! without argument | ||||
| | | * | Try wear_merged! without argument | Dmitriy Zaporozhets | 2014-10-01 | 3 | -3/+3 |
| | |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'checkout_schema.rb' into 'master' | Dmitriy Zaporozhets | 2014-10-01 | 2 | -0/+4 |
| |\ \ | |/ |/| | | | | | | | Clear changes to schema.rb when upgrading See merge request !1142 | ||||
| | * | Clear changes to schema.rb when upgrading | Jacob Vosmaer | 2014-10-01 | 2 | -0/+4 |
| |/ | | | | | | Having local changes is quite common and it is a stumbling block when upgrading GitLab. Because schema.rb is generated from the actual DB schema it is OK to clear the local changes. | ||||
| * | Update changelog for 7.3.2 | Marin Jankovski | 2014-10-01 | 1 | -1/+4 |
| | | | | | | Conflicts: CHANGELOG | ||||
| * | Update guides to use gitlab-shell 2.0.1. | Marin Jankovski | 2014-10-01 | 4 | -5/+5 |
| | | |||||
| * | Update gitlab-shell to v2.0.1. | Marin Jankovski | 2014-10-01 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'add_active_directory_ldap_option' into 'master' | Dmitriy Zaporozhets | 2014-10-01 | 4 | -1/+25 |
| |\ | | | | | | | | | | | | | | | Add active directory ldap option Fixes #1557 See merge request !1139 | ||||
| | * | Add option to gitlab config to specify if LDAP server is active directory. | Marin Jankovski | 2014-09-30 | 4 | -1/+25 |
| | | | |||||
| * | | Merge branch 'readme_tab' into 'master' | Dmitriy Zaporozhets | 2014-10-01 | 5 | -55/+93 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Add Readme tab to project show page Fixes #1533 See merge request !1140 | ||||
| | * | | Add readme tab to changelog. | Marin Jankovski | 2014-09-30 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add a feature for readme on project show page. | Marin Jankovski | 2014-09-30 | 2 | -7/+22 |
| | | | | |||||
| | * | | Save if user prefers readme or activity tab. | Marin Jankovski | 2014-09-30 | 1 | -0/+9 |
| | | | | |||||
| | * | | Add tab for readme and load readme in tab. | Marin Jankovski | 2014-09-30 | 1 | -48/+61 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-30 | 6 | -25/+24 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #7917 from mr-vinn/fix-alt-typo | Robert Schilling | 2014-09-30 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | Fix typo in link title | ||||
| | | * | | | Fix typo in link title | Vinnie Okada | 2014-09-30 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #7914 from cirosantilli/patch-6 | Robert Schilling | 2014-09-30 | 1 | -1/+0 |
| | |\ \ \ | | | | | | | | | | | Remove statement without effect. | ||||
| | | * | | | Remove statement without effect. | Ciro Santilli | 2014-09-30 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Merge pull request #7913 from cirosantilli/fix-dev-merge-seed | Robert Schilling | 2014-09-30 | 1 | -1/+1 |
| | |\ \ \ \ | | |/ / / | |/| | | | Fix dev merge seed: update testme to gitlab-test. | ||||
| | | * | | | Fix dev merge seed: update testme to gitlab-test. | Ciro Santilli | 2014-09-30 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #7911 from cirosantilli/trailing-white | Robert Schilling | 2014-09-30 | 3 | -22/+22 |
| | |\ \ \ \ | | |/ / / | |/| | | | Remove trailing whitespace from views. | ||||
| | | * | | | Remove trailing whitespace from views. | Ciro Santilli | 2014-09-30 | 3 | -22/+22 |
| | |/ / / | |||||
| * | | | | Merge branch 'email_on_push_template_changes' into 'master' | Dmitriy Zaporozhets | 2014-09-30 | 2 | -4/+4 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Email on push template changes Fixes #1304 See merge request !1136 | ||||
| | * | | | Update email templates for email on push service with links to commit and ↵ | Marin Jankovski | 2014-09-30 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | repository. | ||||
| * | | | | 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> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |