Commit Graph

113 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms
Factor group forms
2014-10-21 11:39:41 +03:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button
Factor choose group avatar button
2014-10-21 08:25:09 +02:00
Ciro Santilli 3a47ed979a Factor group forms 2014-10-21 00:25:44 +02:00
Ciro Santilli 01db264ffc Factor choose group avatar button 2014-10-20 23:57:46 +02:00
Ciro Santilli f7d01f2067 Factor group tips 2014-10-20 23:43:51 +02:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Dmitriy Zaporozhets 9021debf50
ConfirmDangerModal window added. It will be used for confirmation of dangerous actions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-08 13:56:57 +03:00
Sytse Sijbrandij 3fff9aa34f Merge pull request #7981 from cirosantilli/www-to-about
Replace www.gitlab.com with about.gitlab.com
2014-10-08 09:46:51 +02:00
Ciro Santilli 7dcbf35019 Replace www.gitlab.com with about.gitlab.com 2014-10-07 13:16:19 +02:00
Valery Sizov fd8d1d9b62 Snippets: rename public to internal 2014-10-07 11:54:00 +03:00
Dmitriy Zaporozhets 43217dd5dd
Merge branch 'cirosantilli-factor-commit-msg-textarea'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
2014-10-03 14:38:33 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 3098e7a453 Factor commit message textareas. 2014-10-02 12:03:30 +02:00
Dmitriy Zaporozhets 4b65b0e0f5
Fix wiki
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-25 13:56:23 +03:00
Ben Bodenmiller 47171aab3d add requests link
Add requests link for feature requests.
2014-09-12 02:07:17 -07:00
Dmitriy Zaporozhets 933d2dcc97 Merge pull request #7634 from zzet/patch-11
Return extra empty line in blob render
2014-08-29 17:43:51 +03:00
Andrew Kumanyaev 039976af46 Return extra empty line in blob render 2014-08-29 17:17:43 +04:00
Dmitriy Zaporozhets 36361f4e45 Prevent 500 error when browse wiki page with repo access
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-29 12:58:47 +03:00
Dmitriy Zaporozhets 8289308933
Restyle project home
* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-28 14:19:11 +03:00
Dmitriy Zaporozhets ecbb3ddf21
Correct no-labels message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 19:35:36 +03:00
Dmitriy Zaporozhets 2ecc79507a
Order labels by name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-30 19:13:35 +03:00
Dmitriy Zaporozhets b2a6f4e136
Refactor label rendering and default label set generation
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 22:19:47 +03:00
Dmitriy Zaporozhets cff1758486
Show counters in sidebar filter in same way like we did for projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-10 17:54:31 +03:00
Dmitriy Zaporozhets 1555146adf Merge branch 'responsive-sidebar' into 'master'
Responsive sidebar

Puts the sidebar on the dashboard in a off-screen sidebar that can be called by pressing a button with a fixed position.

Any sidebar with the .responsive-sidebar class will follow this behavior. Button must be added manually.
2014-06-14 13:50:30 +00:00
Job van der Voort 9c843041fa add responsive sidebar to issues, milestones and MRs 2014-06-14 14:32:41 +02:00
Dmitriy Zaporozhets 9be5425a88
Refactor snippets views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 12:36:46 +03:00
Dmitriy Zaporozhets 0d13abb1c8
Specify language detection for highlight.js
Because I am tired of CHANGELOG highlighted as sql file :)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-07 15:46:58 +03:00
Marin Jankovski da37a251f9 Add ch width. 2014-06-03 12:33:43 +02:00
Marin Jankovski d2851b0883 Do not show a 72 times. 2014-06-03 10:36:27 +02:00
Dmitriy Zaporozhets 5ba00d950b
Add old ui-box style to panels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-30 23:43:53 +03:00
Dmitriy Zaporozhets 38ff5d1ab9
Replace ui-box title with panel-heading
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:43:21 +03:00
Dmitriy Zaporozhets 6dcbe1b43c
Replace ui-box with panel.panel-default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:42:44 +03:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels
Merge Request Labels
2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Ciro Santillli 07a9d44de7 Commit message textareas have 72 char mark line. 2014-04-16 21:55:36 +02:00
dosire 2135da1466 Also make the blog https. 2014-03-03 09:28:28 +01:00
dosire c3d5503984 Link to consolidated website with https links. Fixes #6017 2014-03-02 18:03:37 +01:00
Dmitriy Zaporozhets 8eeebf0de6
Generate labels set from issues page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:47:29 +02:00
Dmitriy Zaporozhets 79dd7beebd Merge branch 'feature/public_groups' into 'master'
Public Groups

This is the initial work (meaning no tests) for making groups public if they have a public project (or internal for logged in users). This allows issues and merge requests to be viewed, but _not_ group membership. As part of this I have also added back the link in the public project title section (it was removed as it didn't make sense before).

This addesses the following suggestions/issues:

http://feedback.gitlab.com/forums/176466-general/suggestions/5314461-groups-containing-one-or-more-public-projects-shou
Issue #32
https://github.com/gitlabhq/gitlabhq/issues/5203
as well as a few closed issues.

This also changes the public user page to only show groups that are accessible to the user in some manner.
2014-02-24 19:37:13 +00:00
Jason Hollingsworth 2f69213e3f Allow access to groups with public projects.
Fixed Group avatars to only display when user has read
permissions to at least one project in the group.
2014-02-20 09:26:38 -06:00
Dmitriy Zaporozhets 32ecb02784
Refactor scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 13:51:22 +02:00
Dmitriy Zaporozhets a718a9af3e
Restyle labels filter to match common style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:48:02 +02:00
Dmitriy Zaporozhets 638f8541dc
Hide labels filter for MRs and remove unnecessary padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:36:03 +02:00
Tudor Pavel 4f6b570fbe Filter issues by multiple labels with Spinach feature spec 2014-02-18 15:38:33 +02:00
Dmitriy Zaporozhets 9b5728057e
Restyle issue/mr top filters for list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 19:59:09 +02:00
Takao Baba 208ec627c3 Fix 500 error in Ruby 1.9. 2014-02-05 14:43:20 +09:00
Dmitriy Zaporozhets 89ab7e79ad Highlight code search results 2014-01-30 13:31:56 +02:00
Dmitriy Zaporozhets b75777fd95
no raw data rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-28 11:53:02 +02:00
Dmitriy Zaporozhets b6454591cc Merge branch 'highlight-js' into 'master'
Highlight.Js

Replace pygments code highlight with client-side library - highlight.js

http://highlightjs.org/
2014-01-28 07:58:59 +00:00
Dmitriy Zaporozhets 78b2fb5de9
Add highlight.js support to markdown, snippets etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 13:12:58 +02:00