Commit Graph
5063 Commits
Author SHA1 Message Date
Ben Bodenmiller ccd181d7c5 link to RSpec. related to #3810 2013-05-03 01:03:49 -07: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
Saito 36efe0f580 Merge pull request #3634 from tsl0922/patch-grack-auth
fix http push 401 and 500 with some git clients
2013-05-02 22:13:43 -07:00
tsl0922 f1c9b05868 better fix for encoding error 2013-05-03 11:31:23 +08:00
tsl0922 4e055e8a63 fix: UTF-8 encoding error 2013-05-03 10:58:53 +08:00
tsl0922 ef61d1f200 fix http push 401 2013-05-03 10:58:53 +08:00
Angus MacArthur ec63804831 Made fixes suggested by @randx in pull request
See https://github.com/gitlabhq/gitlabhq/pull/3597#discussion-diff-4014638
2013-05-02 16:41:33 -04: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 8589f0f400 Non-logged in users see public project names as static text
In the public area, project names are shown as static text for
non-logged in users, while logged-in users are given project
names as links they can follow to the project's page.
2013-05-02 13:32:09 -07:00
Dmitriy Zaporozhets ae006dd90b Merge pull request #3645 from lucasuyezu/alphabetically_sorted
Assignees are now sorted alphabetically.
2013-05-02 05:51:33 -07:00
Dmitriy Zaporozhets fe838588ae Merge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root
[BUGFIX] User suggest at team_members/new not working with relative_url_root
2013-05-02 05:35:26 -07:00
Dmitriy Zaporozhets c8649c5d60 Fix issue with undefined dispather page 2013-05-02 15:28:07 +03:00
Dmitriy Zaporozhets 92f0473354 Move search autocomplete call to dispatcher 2013-05-02 14:51:47 +03:00
Dmitriy Zaporozhets 0b981eb9b3 coffescript refactoring pt.1 2013-05-02 14:36:53 +03:00
Dmitriy Zaporozhets 37f3d0f25b Fix newlines in how-to-merge. Added steps description. Fixes #3772 2013-05-02 13:23:50 +03:00
Dmitriy Zaporozhets 2aa620c25a move more inline js to handle via dispatcher 2013-05-02 11:46:45 +03:00
Dmitriy Zaporozhets 6473aaf877 Remove on-ready for NoteList event 2013-05-02 11:23:58 +03:00
Dmitriy Zaporozhets ca225d92c3 Replace inline document.ready with dispatcher 2013-05-02 11:18:29 +03: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 9c1abeb50a Merge pull request #3799 from ciarand/team-admin-placeholder-text
Swapped out placeholder text on teams admin page
2013-05-01 22:46:39 -07:00
Ciaran Downey 7e5cad8f28 Swapped out placeholder text on teams admin page
Changed "simple Teams description" placeholder subtitle to "allow you
to organize groups of people that have a common focus. Use teams to
simplify the process of assigning roles to groups of people."
2013-05-01 15:09:18 -07:00
Dmitriy Zaporozhets 56d15660b8 gitlab_git to 1.0.6, return submodule rendering in tree 2013-05-01 13:39:37 +03:00
Dmitriy Zaporozhets 083d66563e Update all gems! 2013-05-01 13:29:29 +03:00
Dmitriy Zaporozhets 23ee8e6257 Init aws support for file storage 2013-05-01 12:41:37 +03:00
Dmitriy Zaporozhets cde6b8e4da Merge branch 'install-link' of /home/git/repositories/gitlab/gitlabhq 2013-05-01 09:02:59 +00:00
Sytse Sijbrandij c937b2af5d Link to install guide must point to latest release automatically, 2013-05-01 09:26:40 +02:00
Dmitriy Zaporozhets 00ed1e9088 Merge pull request #3786 from sashkab/emoji-fix
Show emoji popup if colon preceding by space or is new line.
2013-04-30 08:21:21 -07:00
Aleks Bunin 26d0e47ce4 Show emoji popup if : preceeding by space or is new line. 2013-04-30 09:29:43 -04:00
Dmitriy Zaporozhets 3f46287842 require gitlab-shell v1.4.0 2013-04-30 14:49:35 +03:00
Dmitriy Zaporozhets 561ac35553 Merge pull request #3692 from szechyjs/master
Add monokai highlighting theme
2013-04-30 04:01:56 -07:00
Dmitriy Zaporozhets f58d55da07 Update changelog 2013-04-30 13:28:45 +03:00
Dmitriy Zaporozhets 7ec1cfd5f5 Merge pull request #3758 from fredowski/master
Authenticate LDAP users in the grack module - fixed problems - tested code
2013-04-30 03:10:09 -07:00
Dmitriy Zaporozhets acb65516f8 Merge pull request #3652 from brodock/beautifull-diff
Diff with better colors and some spacing on the corners
2013-04-30 01:50:15 -07:00
Dmitriy Zaporozhets 9e13160e64 Merge pull request #3688 from amacarthur/rake-fix
fixed broken gitlab version determination during backup
2013-04-30 01:47:53 -07:00
Dmitriy Zaporozhets b5426d5763 Merge pull request #3784 from senny/upgrade_guide_cleanup
Upgrade guide cleanup
2013-04-30 01:00:36 -07:00
Yves Senn 83eac33823 add missing title to upgrade guide 2013-04-30 09:52:25 +02:00
Yves Senn 4dd855072a link directly to the folder with upgrade guides 2013-04-30 09:51:48 +02:00
Dmitriy Zaporozhets 0b55ec11d5 Merge pull request #3783 from senny/move_update_instructions_to_repo
move the update guides from the wiki into the repo
2013-04-30 00:32:11 -07:00
Yves Senn a7ad09543e move the update guides from the wiki into the repo 2013-04-30 09:29:30 +02:00
Friedrich Beckmann 20a88f5c43 LDAP authentication in grack - check ldap conf before call / added comment 2013-04-29 22:26:03 +02:00
Dmitriy Zaporozhets e7adcaa55b Merge pull request #3771 from senny/move-4-2-to-5-0-from-wiki-to-repo
move the update instructions for 4.2 to 5.0 from the Wiki into the Repo
2013-04-29 06:21:02 -07:00
Yves Senn ad2e4feb5e move the update instructions for 4.2 to 5.0 from the Wiki into the Repo. 2013-04-29 14:52:06 +02:00
Dmitriy Zaporozhets 65b601fe2c Make turbolinks loading more user-friendly 2013-04-29 14:36:40 +03:00
Dmitriy Zaporozhets f81e201cc8 Remove unused code pt.2 2013-04-29 13:54:12 +03:00
Dmitriy Zaporozhets de2cd345eb Remove unused code 2013-04-29 13:50:23 +03:00
Dmitriy Zaporozhets 5872b10de5 Fix loading commit history for tree view 2013-04-29 13:18:08 +03:00
Dmitriy Zaporozhets bfaa3edbf1 Remove tree history & ajax slider 2013-04-29 13:14:55 +03:00