Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version to 6.2.2v6.2.2 | Dmitriy Zaporozhets | 2013-10-31 | 1 | -1/+1 |
| | |||||
* | Update gitlab_git to recent version | Dmitriy Zaporozhets | 2013-10-31 | 2 | -5/+5 |
| | |||||
* | Version 6.2.1v6.2.1 | Dmitriy Zaporozhets | 2013-10-28 | 1 | -1/+1 |
| | |||||
* | Fix for issue #5431 | arul | 2013-10-25 | 1 | -0/+1 |
| | |||||
* | Merge branch '6-2-stable' of github.com:gitlabhq/gitlabhq into 6-2-stable | Dmitriy Zaporozhets | 2013-10-22 | 1 | -2/+2 |
|\ | |||||
| * | Merge pull request #5389 from alexyoder/patch-1 | Jacob Vosmaer | 2013-10-21 | 1 | -2/+2 |
| |\ | | | | | | | change 6-1-stable to 6-2-stable in installation guide | ||||
| | * | change 6-1-stable to 6-2-stable | Alex Yoder | 2013-10-21 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'bash3' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable | Dmitriy Zaporozhets | 2013-10-22 | 1 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Use `2>&1` because Bash 3 does not support `&>>` | Jacob Vosmaer | 2013-10-22 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'disable_rdoc' of /home/git/repositories/gitlab/gitlabhqv6.2.0 | Dmitriy Zaporozhets | 2013-10-21 | 1 | -1/+1 |
|\ | |||||
| * | Skip rdoc to speed up Ruby compilation | Jacob Vosmaer | 2013-10-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2013-10-21 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge pull request #5380 from thestv/patch-1 | Jacob Vosmaer | 2013-10-21 | 0 | -0/+0 |
| |\ \ | | | | | | | | | corrected the url of the init-script | ||||
| | * | | corrected the url of the init-script | Stefan Baust | 2013-10-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Version up to 6.2.0 | Dmitriy Zaporozhets | 2013-10-21 | 1 | -1/+1 |
|/ / / | |||||
* | | | Improve project_merge_requests.rb feature steps | Dmitriy Zaporozhets | 2013-10-21 | 1 | -7/+13 |
| | | | |||||
* | | | Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-10-21 | 1 | -6/+6 |
|\ \ \ | |||||
| * | | | Add smtp settings override in smtp_settings sample file. | Marin Jankovski | 2013-10-18 | 1 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #5382 from nattster/patch-1 | Dmitriy Zaporozhets | 2013-10-20 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Use init.d/gitlab script from 6-0-stable branch | ||||
| * | | | Use init.d/gitlab script from 6-0-stable branch | Natt Piyapramote | 2013-10-21 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like init.d/gitlab script from master branch is not working anymore. Change to a version from 6-0-stable works fine. It says: ``` Starting the GitLab Unicorn web server... /etc/init.d/gitlab: 132: /etc/init.d/gitlab: script/web: not found Starting the GitLab Sidekiq event dispatcher... /etc/init.d/gitlab: 141: /etc/init.d/gitlab: script/background_jobs: not found GitLab is not running. ``` | ||||
* | | | Fix rspec test after bdd3513f03a1db060051a29ffcf535821235eac1 | Dmitriy Zaporozhets | 2013-10-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5373 from rtripault/milestone-iid | Dmitriy Zaporozhets | 2013-10-20 | 5 | -5/+5 |
|\ \ \ | | | | | | | | | Show milestones iid instead of id | ||||
| * | | | A few other iids instead of ids (mostly in edit forms) | Romain | 2013-10-19 | 4 | -4/+4 |
| | | | | |||||
| * | | | Show milestones iid instead of id | Romain | 2013-10-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-10-20 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-10-18 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Add an example. | Marin Jankovski | 2013-10-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #5377 from tsigo/autocomplete_refactor | Dmitriy Zaporozhets | 2013-10-20 | 4 | -46/+160 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Refactor search_autocomplete_source | ||||
| * | | | | Refactor and cover search_autocomplete_source | Robert Speicher | 2013-10-20 | 3 | -45/+142 |
| | | | | | |||||
| * | | | | Cover the simple_sanitize helper | Robert Speicher | 2013-10-19 | 2 | -1/+18 |
|/ / / / | |||||
* | | | | Merge pull request #5363 from Razer6/logrote_for_update_docs | Jacob Vosmaer | 2013-10-18 | 1 | -5/+16 |
|\ \ \ \ | |/ / / |/| | | | Add logrotate config to update docs | ||||
| * | | | Add logrotate config to update docs | Robert Schilling | 2013-10-18 | 1 | -5/+16 |
|/ / / | |||||
* | | | Merge branch 'refactor/gitlab_config_helper' of ↵ | Dmitriy Zaporozhets | 2013-10-18 | 5 | -5/+5 |
|\ \ \ | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | | Use gitlab_config intead of Gitlab.config.gitlab in views | Dmitriy Zaporozhets | 2013-10-17 | 5 | -5/+5 |
|/ / / | |||||
* | | | Add warning for issue visibility. | Sytse Sijbrandij | 2013-10-17 | 1 | -1/+2 |
| |/ |/| | |||||
* | | Merge branch 'fix_sidekiq_process_count' of ↵ | Dmitriy Zaporozhets | 2013-10-17 | 1 | -7/+7 |
|\ \ | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq | ||||
| * | | Count sidekiq processes using String#scan | Jacob Vosmaer | 2013-10-17 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | It seems there is no easy way to count pattern occurences with String#match. | ||||
* | | | Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-10-17 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Update project api doc. | Marin Jankovski | 2013-10-17 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'issue_tracker' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-10-17 | 2 | -3/+45 |
|\ \ | |/ |/| | |||||
| * | Make clearer use of the check. | Marin Jankovski | 2013-10-17 | 1 | -6/+10 |
| | | |||||
| * | Use more descriptive name for config check. | Marin Jankovski | 2013-10-17 | 1 | -4/+4 |
| | | |||||
| * | Fallback to internal issue tracker if config is invalid. | Marin Jankovski | 2013-10-17 | 2 | -3/+41 |
| | | |||||
* | | No text shadow for state-label | Dmitriy Zaporozhets | 2013-10-17 | 1 | -0/+1 |
| | | |||||
* | | Version up to beta | Dmitriy Zaporozhets | 2013-10-17 | 1 | -1/+1 |
| | | |||||
* | | Minor UI improvement for ui-box-show | Dmitriy Zaporozhets | 2013-10-17 | 1 | -1/+2 |
| | | |||||
* | | Add description to issues, projects in development fixtures | Dmitriy Zaporozhets | 2013-10-17 | 2 | -2/+5 |
| | | |||||
* | | Speed up tests | Dmitriy Zaporozhets | 2013-10-17 | 2 | -6/+3 |
| | | |||||
* | | Order milestone due date on issues page filter | Dmitriy Zaporozhets | 2013-10-17 | 1 | -1/+1 |
| | | |||||
* | | Fix GollumWiki::CouldNotCreateWikiError during tests | Dmitriy Zaporozhets | 2013-10-17 | 1 | -2/+8 |
| | |