| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into 6-0-dev | Dmitriy Zaporozhets | 2013-06-22 | 2 | -2/+2 |
| |\ | | | | | | | | | | | Conflicts: VERSION db/schema.rb | ||||
| | * | Merge branch 'master' into install-guide-improvements | Sytse Sijbrandij | 2013-06-21 | 4 | -87/+115 |
| | |\ | | | | | | | | | | | | | Conflicts: doc/install/installation.md | ||||
| | * | | Make the installation guide easier to follow for non-unix people. | Sytse Sijbrandij | 2013-06-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | When stopped correctly there should be no warning about a missing socket file. | Sytse Sijbrandij | 2013-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | You should not be able to remove a Group owner | Dmitriy Zaporozhets | 2013-06-22 | 1 | -0/+16 |
| | | | | |||||
| * | | | Markdown now support users from groups | Dmitriy Zaporozhets | 2013-06-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Classic (mars) theme will be default for 6.0 | Dmitriy Zaporozhets | 2013-06-20 | 1 | -5/+11 |
| | | | | |||||
| * | | | Migrate global project taks. Removed more teams related functionality | Dmitriy Zaporozhets | 2013-06-19 | 1 | -3/+7 |
| | | | | |||||
| * | | | Remove Global namespace from options. Prepared file for migration of global ↵ | Dmitriy Zaporozhets | 2013-06-19 | 1 | -0/+12 |
| | | | | | | | | | | | | | projects | ||||
| * | | | Remove all team resources except models. Move models to deprecated directory | Dmitriy Zaporozhets | 2013-06-18 | 4 | -427/+0 |
| | |/ |/| | |||||
| * | | Refactor grack auth module. Add git over http wiki support | Dmitriy Zaporozhets | 2013-06-14 | 3 | -87/+106 |
| | | | |||||
| * | | Add path blacklist | Dmitriy Zaporozhets | 2013-06-12 | 1 | -0/+9 |
| |/ | |||||
| * | Fix inline diff issue. See #3150 | Dmitriy Zaporozhets | 2013-06-12 | 1 | -4/+3 |
| | | |||||
| * | cattr_accessor is not threadsafe! | Dmitriy Zaporozhets | 2013-06-11 | 2 | -3/+3 |
| | | |||||
| * | Merge pull request #4140 from amacarthur/restore-fixes-clean | Dmitriy Zaporozhets | 2013-06-11 | 3 | -12/+22 |
| |\ | | | | | fixes for gitlab restore with non-standard backup and repo dirs | ||||
| | * | Correction to restore expected current directory | Angus MacArthur | 2013-06-03 | 1 | -9/+14 |
| | | | |||||
| | * | fixes for gitlab restore with non-standard backup and repo dirs | Angus MacArthur | 2013-05-30 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | These fixes will allow a restore of gitlab when the backups and repositories directories are in non-standard locations (ie sub-dirs of gitlabhq). Also allows the restore to be run from script overriding the need of a user to confirm the rebuild of the authorized_keys file. | ||||
| * | | Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-check | Dmitriy Zaporozhets | 2013-06-11 | 2 | -3/+3 |
| |\ \ | | | | | | | Fix abort gitlab:app:check | ||||
| | * | | Fix abort gitlab:app:check | Sato Hiroyuki | 2013-06-06 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | When the file that pointed git bin_path in gitlab.yml dose'nt exist, bundle rake gitlab:app:check would be aborted. refs #4205 | ||||
| * | | | Merge pull request #4260 from dosire/pygments-name | Dmitriy Zaporozhets | 2013-06-09 | 1 | -1/+2 |
| |\ \ \ | | | | | | | | | Fix pygment lexer 500 errors when an alias is used instead of a name. | ||||
| | * | | | Fix pygment lexer 500 errors when an alias is used instead of a name. | Sytse Sijbrandij | 2013-06-09 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | API: project events | Dmitriy Zaporozhets | 2013-06-06 | 2 | -0/+20 |
| | | | | | |||||
| * | | | | API: Add last_activity_at date to project entity | Dmitriy Zaporozhets | 2013-06-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #4204 from axilleas/initd_check-fix | Dmitriy Zaporozhets | 2013-06-06 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | Read init script recipe from Rails.root path. Fix #4174 | ||||
| | * | | | | Read init script recipe from Rails.root path. Fix #4174 | Axilleas Pipinellis | 2013-06-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr> | ||||
| * | | | | | API: implement retrieve of repository tree | Dmitriy Zaporozhets | 2013-06-06 | 1 | -0/+25 |
| | | | | | | |||||
| * | | | | | API: Fix repository commits pagination | Dmitriy Zaporozhets | 2013-06-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix snippet raw content being escaped | Dmitriy Zaporozhets | 2013-06-06 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Split Project api on several parts: deploy_keys, hooks, snippets etc | Dmitriy Zaporozhets | 2013-06-06 | 5 | -261/+316 |
| | | | | | | |||||
| * | | | | | Fix milestone api docs: invalid param for close | Dmitriy Zaporozhets | 2013-06-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix wrong documentation for issue close api. Fixes #3548 | Dmitriy Zaporozhets | 2013-06-06 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #4155 from babatakao/selectable_master_project_deploy_keys | Dmitriy Zaporozhets | 2013-06-05 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Selectable deploy keys contain master projects | ||||
| | * | | | | | Selectable deploy keys contain master projects | babatakao | 2013-06-05 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | This commit got lost ↵ | Sytse Sijbrandij | 2013-06-05 | 1 | -0/+1 |
| | |_|/ / |/| | | | | | | | | | | | https://github.com/gitlabhq/gitlab-recipes/commit/76ba45246e93e9c764580fe54ccfe38da751afbe | ||||
| * | | | | Its better to load graph with ajax since it requires ~10 seconds for bigger ↵ | Dmitriy Zaporozhets | 2013-06-05 | 2 | -52/+0 |
| | | | | | | | | | | | | | | | | | projects to finish up | ||||
| * | | | | Contributors graphs feature for GitLab | Karlo Soriano | 2013-06-05 | 2 | -0/+52 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created tests and refactored some code along the way Added stat graph util spec, refactored code finsihed up tests and refactors finsihed up tests and refactors | ||||
| * | | | Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into ↵ | Dmitriy Zaporozhets | 2013-06-04 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Andrew8xx8-gist Conflicts: Gemfile.lock app/models/ability.rb app/models/project.rb app/views/snippets/_form.html.haml db/schema.rb features/steps/shared/paths.rb spec/factories.rb spec/models/project_spec.rb | ||||
| | * | | | Tests fixed | Andrew8xx8 | 2013-03-25 | 1 | -3/+3 |
| | |/ / | |||||
| * | | | Fix deploy key api 500 if key is empty | Dmitriy Zaporozhets | 2013-06-03 | 1 | -14/+16 |
| | | | | |||||
| * | | | Add api to collect owned user projects. Api deploy_key.create: Enable deploy ↵ | Dmitriy Zaporozhets | 2013-06-03 | 2 | -2/+32 |
| | | | | | | | | | | | | | key if it exist in other owned project | ||||
| * | | | No check access if no relation between user and project | Andrey Kumanyaev | 2013-06-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix bug with team assignation on project from #4109 | Andrey Kumanyaev | 2013-06-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Update membership instead of remove/add if it permissions were changed | Dmitriy Zaporozhets | 2013-05-30 | 1 | -4/+10 |
| | | | | |||||
| * | | | UserTeam: Fixed bug when impossible to change admin flag after checked | Dmitriy Zaporozhets | 2013-05-30 | 1 | -8/+13 |
| | | | | |||||
| * | | | TeamManagement: Dont update permissions if it was not changed | Dmitriy Zaporozhets | 2013-05-30 | 1 | -13/+11 |
| | | | | |||||
| * | | | Merge pull request #4115 from bke-drewb/apidocs | Dmitriy Zaporozhets | 2013-05-29 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Update api docs and remove old attribute from User entity. | ||||
| | * | | | Update api docs and remove old attribute from User entity. | Drew Blessing | 2013-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity. Add color scheme ID to API User entity | ||||
| * | | | | Merge pull request #4101 from bassrock/master | Dmitriy Zaporozhets | 2013-05-29 | 1 | -2/+2 |
| |\ \ \ \ | |_|_|/ |/| | | | Update suggestion for Check.rake | ||||
| | * | | | Update check.rake | bassrock | 2013-05-27 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #4098 from pguridi/jira | Dmitriy Zaporozhets | 2013-05-29 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | Jira - Fixed Jira Issue tracker support | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |