| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge branch 'gitlab_importer' into 'master' | Dmitriy Zaporozhets | 2015-01-29 | 1 | -1/+13 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Ability to clone project using oauth2 token See merge request !1447 | |||||
| | | * | | an ability to clone project with oauth2 token | Valery Sizov | 2015-01-28 | 1 | -1/+13 | |
| | | | | | ||||||
| | * | | | Refactor commit calendar a bit. Fixed dates | Dmitriy Zaporozhets | 2015-01-28 | 1 | -8/+0 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵ | Dmitriy Zaporozhets | 2015-01-28 | 1 | -1/+1 | |
| | |\ \ \ | | | | | | | | | | | | | | | | haynes/gitlab-ce-commit_calendar | |||||
| | | * | | | Be more careful with parsing changes from gitlab-shell | Dmitriy Zaporozhets | 2015-01-28 | 1 | -1/+1 | |
| | | |/ / | ||||||
| | * | | | Add a commit calendar to the user profile | Hannes Rosenögger | 2015-01-29 | 1 | -0/+79 | |
| | |/ / | ||||||
| | * | | Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' | Dmitriy Zaporozhets | 2015-01-27 | 1 | -7/+5 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Move external issue tracker away from yml config See merge request !1442 | |||||
| | | * \ | Merge branch 'master' into move_external_issue_tracker_away_from_yml_config | Marin Jankovski | 2015-01-26 | 1 | -3/+9 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb | |||||
| | | * | | | Move repetition to the parent. | Marin Jankovski | 2015-01-26 | 1 | -5/+4 | |
| | | | | | | ||||||
| | | * | | | Update the issue tracker attribute on issue tracker change. | Marin Jankovski | 2015-01-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Merge branch 'master' into move_external_issue_tracker_away_from_yml_config | Marin Jankovski | 2015-01-23 | 3 | -8/+22 | |
| | | |\ \ \ | ||||||
| | | * | | | | Do a check which issue tracker is used inside the project. | Marin Jankovski | 2015-01-23 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | Use service settings instead of config file settings to present issues. | Marin Jankovski | 2015-01-23 | 1 | -4/+3 | |
| | | | | | | | ||||||
| | * | | | | | Refactor web editor | Dmitriy Zaporozhets | 2015-01-26 | 1 | -4/+4 | |
| | | |_|/ / | |/| | | | ||||||
| | * | | | | Files::CreateService can now commit file to empty repository | Dmitriy Zaporozhets | 2015-01-26 | 1 | -3/+9 | |
| | | |/ / | |/| | | ||||||
| * | | | | actually fix indentation | Marco Wessel | 2015-01-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix indentation | Marco Wessel | 2015-01-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Allow configuring protection of the default branch upon first push | Marco Wessel | 2015-01-25 | 2 | -0/+17 | |
| |/ / / | ||||||
| * | | | Stop git zombie creation during force push check | Jacob Vosmaer | 2015-01-22 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #7762 from jubianchi/commit-closing-issues | Dmitriy Zaporozhets | 2015-01-21 | 1 | -7/+12 | |
| |\ \ \ | | | | | | | | | Allow commit messages to close several issues at once | |||||
| | * | | | Allow commit messages to close several issues at once (thanks @123Haynes | jubianchi | 2015-01-20 | 1 | -7/+12 | |
| | | | | | | | | | | | | | | | | | for his work and help) | |||||
| * | | | | developer can push to protected branches | Valery Sizov | 2015-01-20 | 1 | -0/+9 | |
| | |/ / |/| | | ||||||
| * | | | Github Importer: AJAX update status | Valery Sizov | 2015-01-20 | 1 | -0/+2 | |
| |/ / | ||||||
| * | | Merge branch 'database-fix-setting' into 'master' | Marin Jankovski | 2015-01-19 | 1 | -19/+4 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Check for database connection when running current_application_settings The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown. See merge request !292 | |||||
| | * | | Check for database connection before loading current application settings | DJ Mountney | 2015-01-14 | 1 | -19/+4 | |
| | | | | ||||||
| * | | | Test git builder over annotated tag | Dmitriy Zaporozhets | 2015-01-15 | 1 | -2/+5 | |
| | | | | ||||||
| * | | | Send checkout sha for web hooks and services | Dmitriy Zaporozhets | 2015-01-15 | 2 | -52/+70 | |
| |/ / | ||||||
| * | | Rescue database error in application settings if the database still doesn't ↵ | Marin Jankovski | 2015-01-14 | 1 | -1/+12 | |
| | | | | | | | | | exist. | |||||
| * | | Improve github import page UI | Dmitriy Zaporozhets | 2015-01-13 | 1 | -3/+3 | |
| | | | ||||||
| * | | Merge branch 'github_importer' | Dmitriy Zaporozhets | 2015-01-13 | 4 | -1/+115 | |
| |\ \ | | | | | | | | | | | | | Conflicts: app/helpers/projects_helper.rb | |||||
| | * | | Github Importer | Valery Sizov | 2015-01-10 | 4 | -1/+115 | |
| | | | | ||||||
| * | | | Merge branch 'git-http-blacklist' into 'master' | Jacob Vosmaer | 2015-01-13 | 1 | -2/+20 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Git HTTP blacklist See merge request !1328 | |||||
| | * \ \ | Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist | Jacob Vosmaer | 2015-01-08 | 2 | -10/+34 | |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: CHANGELOG | |||||
| | * | | | White-list requests from 127.0.0.1 | Jacob Vosmaer | 2015-01-06 | 1 | -4/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | On some misconfigured GitLab servers, if you look in production.log it looks like all requests come from 127.0.0.1. To avoid unwanted banning we white-list 127.0.0.1 with this commit. | |||||
| | * | | | Add more comments explaining how we block IPs | Jacob Vosmaer | 2014-12-18 | 1 | -1/+4 | |
| | | | | | ||||||
| | * | | | Block Git HTTP Basic Auth after 10 failed attempts | Jacob Vosmaer | 2014-12-15 | 1 | -2/+12 | |
| | | | | | ||||||
| * | | | | Refactor push data builder. Moved it to separate class | Dmitriy Zaporozhets | 2015-01-11 | 1 | -0/+63 | |
| | | | | | | | | | | | | | | | | | Also execute GitLab CI on creating tag via UI | |||||
| * | | | | Rescue missing database errors | Jacob Vosmaer | 2015-01-09 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While loading the Rails app we cannot assume that the gitlabhq_xxx database exists already. If we do, `rake gitlab:setup` breaks! This is a quick hack to make sure that fresh development setups of GitLab (from master) will work again. | |||||
| * | | | | Merge branch 'popen_close_stdin' | Dmitriy Zaporozhets | 2015-01-08 | 1 | -0/+3 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG | |||||
| | * | | | | Close standard input in Gitlab::Popen.popen | Jacob Vosmaer | 2015-01-05 | 1 | -0/+3 | |
| | | |/ / | |/| | | ||||||
| * | | | | Create ApplicationSettings if does not exist in runtime | Dmitriy Zaporozhets | 2015-01-08 | 1 | -8/+13 | |
| | | | | | ||||||
| * | | | | Hack for migrating to new settings | Dmitriy Zaporozhets | 2015-01-08 | 1 | -1/+11 | |
| | | | | | ||||||
| * | | | | Improve application settings and write tests | Dmitriy Zaporozhets | 2015-01-08 | 1 | -0/+7 | |
| |/ / / | ||||||
| * | | | Add option to disable/enable developers push to already protected branches. | Marin Jankovski | 2014-12-26 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Move protected branch actions into a method. | Marin Jankovski | 2014-12-26 | 1 | -12/+20 | |
| | | | | ||||||
| * | | | Allow regular code push for developers if the protected branch allows it. | Marin Jankovski | 2014-12-26 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Add theme type css class | Drew Blessing | 2014-12-15 | 1 | -0/+14 | |
| |/ / | ||||||
| * | | Merge branch 'sidekiq_memory_killer_grace_time' into 'master' | Dmitriy Zaporozhets | 2014-12-08 | 1 | -24/+29 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'grace time' behavior to Sidekiq MemoryKiller The previous iteration of the memory killer did not give 'large' jobs much of a chance to finish. This caused them to come back after each restart, leading to another memory-induced shutdown. By adding some 'grace time' between the moment we detect a memory peak and the moment we start shutting down, we hope to give Sidekiq a chance to get whatever causes its memory to grow 'out of its system'. See merge request !1313 | |||||
| | * | | Fix typo | Jacob Vosmaer | 2014-12-08 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Use constants instead of getters | Jacob Vosmaer | 2014-12-08 | 1 | -26/+13 | |
| | | | | ||||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |