Commit Graph
900 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9ae26cd128 Merge pull request #4257 from jojosch/fix/routing-commit-with-#
Routing fix Commit-List: branch with # and + in name
2013-06-11 01:03:03 -07:00
Dmitriy Zaporozhets 038d40f0f5 Solve inconsistency between network graph & stat graphs 2013-06-11 09:54:01 +03:00
Johannes Schleifenbaum c830bab79a Commit List and Tree allow also + in branch name 2013-06-09 23:47:55 +02:00
Johannes Schleifenbaum 37ff9d88ec Routing fix Commit-List: switch to branch with # in name 2013-06-09 16:28:55 +02:00
Dmitriy Zaporozhets 8df699a336 API: project events 2013-06-06 19:19:17 +03:00
Dmitriy Zaporozhets da6f4f06c7 API: implement retrieve of repository tree 2013-06-06 18:01:03 +03:00
Dmitriy Zaporozhets 470f9064fa Merge pull request #4206 from babatakao/authorize_all_teams_to_admin
Authorize all teams to admin: fix 500 error on showing team page.
2013-06-06 07:14:50 -07:00
Dmitriy Zaporozhets 0fbaf95f13 Merge pull request #4155 from babatakao/selectable_master_project_deploy_keys
Selectable deploy keys contain master projects
2013-06-05 23:05:58 -07:00
Dmitriy Zaporozhets f1e0d37b15 Its better to load graph with ajax since it requires ~10 seconds for bigger projects to finish up 2013-06-05 15:50:11 +03:00
Karlo Sorianoandkarlo57 71d67e6557 Contributors graphs feature for GitLab
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
2013-06-05 16:51:48 +08:00
babatakao 86a262de1a Authorize all teams to admin: fix 500 error on showing team page.
500 error was occured in the following steps:

1. user1 creates new team "team1".
2. Assign team1 to project1.
3. Sign in as admin. This admin is not a member of team1.
4. Open project1 team setting page (/project1/team).
5. Click "team1" link in "Assigned teams" area.
6. 500 error.

Fixed this issue.
2013-06-05 15:41:33 +09:00
babatakaoandbaba 37a90d5f76 Selectable deploy keys contain master projects 2013-06-05 02:59:30 +09:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into 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
2013-06-04 18:36:22 +03:00
Christian Höltje 336750c916 user_color_scheme_class with current_user
This refactors the `user_color_scheme_class` to use
a hash with a default.  This prevents problems
with workers that don't have access to the
current_user.

Fixes issue #2758
2013-06-03 11:39:46 -04:00
Andrey Kumanyaev 08c2c94d46 Fix bug with team assignation on project from #4109 2013-06-01 19:24:15 +04:00
Dmitriy Zaporozhets 132575faa0 Fix routiong specs after rename of resque controller 2013-05-30 11:44:35 +03:00
Dmitriy Zaporozhets ec1055076c Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
Conflicts:
	config/gitlab.yml.example
2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets c3ba0ee64b Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api
Conflicts:
	doc/api/README.md
2013-05-27 15:05:01 +03:00
Dmitriy Zaporozhets 25236efe6e fix missing user2 in api:repositories specs 2013-05-23 12:26:06 +03:00
Dmitriy Zaporozhets 068cf2f467 split repositories and projects api 2013-05-23 12:23:47 +03:00
Dmitriy Zaporozhets bbaa0fccfa Update poltergeist and should-matchers 2013-05-23 11:54:44 +03:00
Christian Simon 0ebfa5e5a2 [FEATURE] Basic user_teams api
* Closing #3066
 * Closing #3609
2013-05-21 23:13:30 +02:00
Ben Bodenmiller de29a424e6 changed Gitlab to GitLab 2013-05-19 02:13:39 -07:00
Dmitry Medvinsky 22279bc558 Add settings for user permission defaults
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
2013-05-16 18:02:22 +04:00
AlexDenisov 6e8cb84449 Added few tests on Issues::BulkUpdateContext 2013-05-16 10:32:27 +00:00
AlexDenisov d79592a7f6 Added spec on bulk issues update 2013-05-16 10:32:26 +00:00
Dmitriy Zaporozhets 634cbd7138 Refactor API classes. So api classes like Gitlab::Issues become API::Issues 2013-05-14 15:33:31 +03:00
Dmitriy Zaporozhets 2ddd6d952b Merge pull request #3880 from hiroponz/fix-check-git-version
Add Gitlab::VersionInfo class to fix and simplify version check.
2013-05-08 11:12:42 -07:00
Dmitriy Zaporozhets 8688789353 Merge pull request #3834 from ichord/gfm-autocomp
improve gfm autocomplete
2013-05-08 04:18:16 -07:00
Sato Hiroyuki 862e0ff6b8 Add Gitlab::VersionInfo class to fix and simplify version check.
It returns "yes" if required version is "1.7.10" and current version is "1.6.10",
because the patch version of current version equals to that of required version.
2013-05-08 17:36:48 +09:00
Dmitriy Zaporozhets 04da04ff64 fix api delete hook test 2013-05-07 19:46:35 +03:00
Dmitriy Zaporozhets af5d0e9e92 Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes
Code cleanup: Replace old hashes and remove trailing spaces
2013-05-07 06:59:03 -07:00
Nihad Abbasov 77d0e41df0 fix API route to delete project hook 2013-05-07 00:09:23 +05:00
Dmitriy Zaporozhets 4528fa9817 modify api to work with new deploy keys 2013-05-06 16:24:58 +03:00
Dmitriy Zaporozhets 1882baa1aa Feature: Deploy keys between projects 2013-05-06 15:10:55 +03:00
Dmitriy Zaporozhets 42b86b79d0 Model specs for DeployKeys 2013-05-06 15:09:26 +03:00
Andrey Kumanyaev a50d96a841 Repair failed test 2013-05-05 18:02:02 +04:00
Andrey Kumanyaev b1b354b0f8 remove trailing spaces 2013-05-05 18:02:02 +04:00
Andrey Kumanyaev 67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
ichord 439cd3ebd3 autocomplete issues and preload autocomplete data.
update jquery-atwho-rails to v0.3.0

add autocomplete_source action to project for gfm autocomplete

move init_autocomplete layout from head_panel to project_resource
2013-05-04 11:26:43 +08:00
Dmitriy Zaporozhets 2fc236177f Merge pull request #3801 from holdtotherod/feature/internally-public-projects
Internally public projects
2013-05-03 00:00:48 -07:00
Dmitriy Zaporozhets f40d4e6685 Merge pull request #3597 from amacarthur/fork-pull-request
updated fork feature to use gitlab-shell for v5 of gitlab
2013-05-02 23:41:07 -07:00
Angus MacArthur de8df1be1a Fix bug for repeated fork requests
When asking to fork a project and a project with the same name
already exists (likely from a previous fork), the recovery from
the fork failure would inadvertantly delete the repo of the
existing destination project.
2013-05-02 16:41:24 -04:00
Stephen Lottermoser a7ba81ea5d Fix internally public projects tests
Takes into account 98bea4b1ff and 3b88636d3c.
2013-05-02 00:57:10 -07:00
Stephen LottermoserandStephen Lottermoser 4c44c5ef9a Internally public projects
Public projects listed in the public section will be linked to the
actual project's page. Public projects now give any user Guest
permissions to the project, allowing them to download the code, read
and create issues, and view anything else in the project's pages.

Ample access tests have been added to the project_access_spec to
verify correct permissions and behavior on public projects.
- Visitors to the site who are not logged in still cannot view the
  project's pages.
- Logged-in users visiting a public project where they are not a team
  member can create issues, but not snippets. They can view the projects
  code, issues, merge requests, etc, just as if they were a Guest member
  of the project.
- Since this is a public project, the user is also granted :download_code
  permissions, a permission normally reserved for Reporters, since they
  can clone the repo anyways and browse commits and branches locally.
2013-05-02 00:06:59 -07:00
Dmitriy Zaporozhets 4f5aae1d26 fix test 2013-05-02 08:47:42 +03:00
Dmitriy Zaporozhets 083d66563e Update all gems! 2013-05-01 13:29:29 +03:00
Dmitriy Zaporozhets 4f2d2c90f7 Move Gitlab::Git out of gitlab core 2013-04-27 23:50:17 +03:00
Dmitriy Zaporozhets 1af2aeffc8 Minor usability improvements 2013-04-18 17:28:09 +03:00
Dmitriy Zaporozhets 211c433cd8 Gitlab::Git::Stats specs 2013-04-16 16:39:48 +03:00