Commit Graph
511 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d1ffbdfcb6 Avoid 500 error on project page when application is close to RAM limit 2013-10-10 11:05:49 +03:00
Dmitriy Zaporozhets a37b8ab2b2 Merge pull request #5291 from astratto/title_issue_trackers
Use proper titles for issues trackers
2013-10-09 04:10:09 -07:00
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Dmitriy Zaporozhets eb7072de91 Fix avatar margin for files view 2013-10-07 16:56:02 +03:00
Dmitriy Zaporozhets 970d86b7c5 Refactor blob finding 2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 7bb03a536a Hide new issue button if not authorized 2013-09-25 18:26:54 +03:00
Dmitriy Zaporozhets c611ea513c Fixed styling for delete button of snippet 2013-09-25 17:20:07 +03:00
Dmitriy Zaporozhets 11605c2d8d Tree files use normal font-weight 2013-09-25 16:59:38 +03:00
Dmitriy Zaporozhets 573d367be5 Modify permissions for project and group
* Hooks and team pages allowed only for masters/owners
* Group page allowed for admin
* Corrent authentication for Projects controller
* Hide some project elements from visitor
2013-09-25 14:05:35 +03:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 66998f6d46 Allow non authenticated user access to public projects 2013-09-24 15:58:39 +03:00
Dmitriy Zaporozhets 9587506124 Dont override default table with bootstrap class. Refactor table css 2013-09-24 12:08:28 +03:00
Dmitriy Zaporozhets df92d4ff67 Merge pull request #5072 from jbornschein/proj-new-public
Add "public-project?" checkbox to new-project view
2013-09-14 06:19:56 -07:00
Joerg Bornschein c71460d2d3 Use ruby 1.9 hash syntax 2013-09-14 13:28:15 +02:00
Joerg Bornschein 83b212a4ef Add public-project? checkbox to new-project view 2013-09-13 14:39:04 +02:00
Marin Jankovski 91e112ffe2 Replace remote url on selection. 2013-09-13 10:12:42 +02:00
Dmitriy Zaporozhets e1ca9de0da Add default values to compare page link 2013-09-12 21:46:31 +03:00
Dmitriy Zaporozhets 069a6dfa91 Compare link for branches 2013-09-12 21:39:53 +03:00
Dmitriy Zaporozhets f774949d3f Compare page improved
* Show new merge request button from compare page
* Show message if user selected same branches
* Show message if compared branches are the same
* Prepend inputs with from/to labels
2013-09-12 20:15:10 +03:00
Ryan Mendivil 0a05ab9126 Fix bug with rendering changing images in commits
When viewing the diff for a changed image file, two bugs occur:

- Both the 'before' and 'after' images link to the 'after' commit
- Visiting the link for either image will cause a error

The first is caused by both image links referencing '@commit.id' rather
than '@commit.parent_id'.  The second is caused by the use of
'project_tree_path' which is used for creating links to directories in
the git file tree. 'project_blob_path' which links to files should be
used instead.
2013-09-11 18:53:37 -08:00
Dmitriy Zaporozhets c7cb7599e2 Merge pull request #5022 from amacarthur/config-public-project
make public/private setting for project creation configurable
2013-09-10 08:21:37 -07:00
Dmitriy Zaporozhets 94d364e8cc UI fixes for commits lists 2013-09-10 13:15:49 +03:00
Dmitriy Zaporozhets a30ce86690 Improve commits list UI 2013-09-10 10:17:15 +03:00
Angus MacArthur cfe13a0d9f update to project creation page to reflect default public project setting 2013-09-09 16:26:27 -04:00
Dmitriy Zaporozhets 9ad5d9a4c6 Merge branch 'feature/mr_description' of /home/git/repositories/gitlab/gitlabhq 2013-09-09 15:44:48 +00:00
Dmitriy Zaporozhets e0ca2adafd Improve Merge Request form
* added description
* simplified form
* enabled gfm autocomplete
2013-09-09 17:11:58 +03:00
Dmitriy Zaporozhets 9e9f055141 Move commits dates to left 2013-09-09 16:20:43 +03:00
Boyan Tabakov 01ff084a4d Improved large commit handling.
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
2013-09-07 14:44:03 +03:00
Dmitriy Zaporozhets 8457415eb9 Add links to create branch/tag from project home page 2013-08-27 13:20:36 +03:00
Dmitriy Zaporozhets 61d9860158 Remove team mentions 2013-08-27 12:59:44 +03:00
Dmitriy Zaporozhets 01c8aae8f2 Add br for new sentense in Compare view 2013-08-26 16:46:03 +03:00
Dmitriy Zaporozhets 241286a7b3 Merge pull request #4897 from rtripault/iids
[#4821] - Fix some missing iids
2013-08-26 06:32:15 -07:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Romain 3d8f38c683 [#4821] - Fix some missing iids 2013-08-26 14:54:07 +02:00
Dmitriy Zaporozhets 86d92bdae7 Merge branch 'userfriendly-compare-page' of /home/git/repositories/gitlab/gitlabhq 2013-08-26 10:38:27 +00:00
Dmitriy Zaporozhets bda409c4c8 Add placeholders from and to 2013-08-26 10:37:58 +00:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
2013-08-25 18:58:41 -04:00
Sytse Sijbrandij dc3e1d6392 People like Karen and myself are confused by the placeholder, it seems like you don't have to change the master value. Also the to and from should be more prominent. 2013-08-23 15:52:49 +02:00
Dmitriy Zaporozhets 9a00bbda89 Show reopen milestone button if milestone was closed 2013-08-22 15:45:36 +03:00
Dmitriy Zaporozhets 08be25eb4b Merge pull request #4826 from amouhzi/patch-1
Fix bug in ace-src-noconflict with Relative url.
2013-08-21 04:12:46 -07:00
Hiroyuki Sato 1101ceb3f4 A little improvement
1. Replace params key 'q' with 'extended_sha1'. A extended SHA1 syntax is explained in 'man gitrevisions'.
2. Change the placeholder of looking for commit.
3. Change the label of ref filter.
2013-08-21 19:20:29 +09:00
Hassan Amouhzi a38c6550db Fix bug in ace-src-noconflict with Relative url.
If we doesn't use a relative url we have this:
<pre>gon.relative_url_root=""</pre>
Else <pre>gon.relative_url_root="/gitlab"</pre>

Gitlab::Application.config.assets.prefix contains:
<pre>/assets</pre>
2013-08-21 09:13:50 +02:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets 817b9d1b47 Merge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:10:40 +00:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +03:00
Hiroyuki Sato fd0afcc996 Remove the dependancy of grit from class Network::Graph 2013-08-20 12:05:23 +09:00
Dmitriy Zaporozhets 608f328653 Show iid as default id for issues, mr 2013-08-19 22:12:40 +03:00