Commit Graph
14039 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 660585caa4 Merge branch 'bump-gitlab-shell' into 'master'
Bump gitlab shell

Use gitlab-shell v1.9.5

Fixes #1300
2014-05-31 14:25:08 +00:00
Dmitriy Zaporozhets 94b0f1b2bb Bump gitlab-shell version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-31 15:57:22 +03:00
Dmitriy Zaporozhets 5d6f5be060 New colors for success/warning/primary
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-31 14:48:33 +03:00
Dmitriy Zaporozhets e53f4a4ea5 Use same color vars for primary/warning styles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-31 14:24:04 +03:00
Dmitriy Zaporozhets 8beb7c886e Different UI colors for archive project and remove project
Since remove is more danger in compare to archive it good to have them
in different colors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-31 14:21:13 +03:00
Dmitriy Zaporozhets c2c43e6aa1 Small ui improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-31 14:00:23 +03:00
Dmitriy Zaporozhets 1a97db413b Simplify issue-box style 2014-05-31 00:41:11 +03:00
Jeroen van Baarsen 3351f15af6 Put back the travis information
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-05-30 23:34:52 +02:00
Jeroen van Baarsen 2314438925 Fix for failing specs 2014-05-30 23:19:50 +02:00
Dmitriy Zaporozhets e02aec6627 Use var colors for panels 2014-05-31 00:13:15 +03: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
Jeroen van Baarsen 65cf5957de Removed the Support Email setting
This setting was not longer used in GitLab, so i think it can be
removed.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-05-30 20:11:07 +02:00
Dmitriy Zaporozhets 72b295259e Show only personal projects on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-30 18:22:59 +03:00
Marin Jankovski 4a03bbe483 Add nofollow to all internal links. 2014-05-30 17:09:31 +02:00
Dmitriy Zaporozhets d54d3324b1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-30 18:05:14 +03:00
Dmitriy Zaporozhets ac777911fd Merge branch 'tags-protection' into 'master'
Git tags protection

Only masters can remove or modify git tags.

Fixes #1223
2014-05-30 15:04:28 +00:00
Dmitriy Zaporozhets bd7c3955b1 Merge pull request #6882 from Tandrial/master
Satellites access fix
2014-05-30 16:59:02 +03:00
Dmitriy Zaporozhets 7a75b3f300 Merge pull request #6986 from agjmills/master
added SYSV chkconfig property so gitlab starts after MySQLd / nginx
2014-05-30 16:58:37 +03:00
Dmitriy Zaporozhets d8c7efa626 Dont allow git tag rewrite/removal unless you are master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-30 16:26:45 +03:00
Marin Jankovski 7ba1853660 Add to changelog v6.9.2
Conflicts:
	CHANGELOG
2014-05-30 12:31:45 +02:00
Dmitriy Zaporozhets f329d34ff3 Fix group projects fetch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 22:03:42 +03:00
Dmitriy Zaporozhets 8f259c5ecc Merge branch 'improve-group-settings-ui' into 'master'
Improve group settings ui
2014-05-29 18:59:49 +00:00
Dmitriy Zaporozhets 5b26b45dcb Improve group settings UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 21:30:20 +03:00
Dmitriy Zaporozhets e6f1eef478 Fix group tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 21:30:07 +03:00
Dmitriy Zaporozhets 4f9669cd9f Improve help page content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 20:35:43 +03:00
Dmitriy Zaporozhets e9c440d221 Merge branch 'ui-panel-boxes' into 'master'
UI panel boxes

Replace custom ui-box with bootstrap `panels`. No sense to use custom components if we can use bootstrap.

UI different is minimal so no screenshots
2014-05-29 17:25:52 +00:00
Sytse Sijbrandij 5e20b0a73c Merge branch 'new_index_converter' into 'master'
New index converter
2014-05-29 16:58:48 +00:00
Dmitriy Zaporozhets 4c51619de3 Use more logic class names for buttons in panel headings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 19:42:49 +03:00
Dmitriy Zaporozhets b66d9c4f28 Remove ui-box css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 19:32:19 +03:00
Dmitriy Zaporozhets a2b3eb134a Move from ui-box to panels
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-29 18:57:27 +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
Kyle Fazzari c1b1c32196 Add summaries for notes and merge requests to dashboard feed.
This fixes #305.
2014-05-29 07:55:55 -07:00
Kyle Fazzari 2e03ccff02 Update event helper to display target_iid in event title instead of target_id.
The event helper is used extensively within the dashboard atom feed, so by
fixing this, we fixed #303.
2014-05-29 07:46:45 -07:00
Kyle Fazzari 97e06bcfe6 Update events helper to also return a URL for notes.
This fixes #304 since it was linking back to the dashboard feed
only as a result of it being given no URL at all for notes.
2014-05-29 07:37:28 -07:00
Dmitriy Zaporozhets e6beb60903 Merge branch 'raise-hard-limit' into 'master'
Raise hard limit
2014-05-29 14:11:17 +00:00
Jacob Vosmaer bc62c283c6 Download schema.rb.bundled if necessary 2014-05-29 15:42:20 +02:00
Dmitriy Zaporozhets e569cf369a Merge pull request #6991 from jvanbaarsen/branch-counter-after-delete
Make sure the branch counter gets updated
2014-05-29 15:39:46 +03:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag
Add CreateTagService.  Use new service to allow tag creation through API.
2014-05-29 15:37:42 +03:00
Dmitriy Zaporozhets ec837932d0 Merge pull request #7036 from willkara/patch-1
Too many zeros in CPU req listing
2014-05-29 15:19:27 +03:00
Dmitriy Zaporozhets b1ce97d5a1 Merge branch 'updating-readme' into 'master'
Updating readme
2014-05-29 11:35:10 +00:00
Dmitriy Zaporozhets e0b430ad13 Merge branch 'clearify-the-development-install' into 'master'
Clearify the development install

Discussed this with @marin, he agrees.
2014-05-29 11:34:37 +00:00
Dmitriy Zaporozhets 0e4bc4e6de Merge branch 'link-doc-help' into 'master'
Readme on the help page

Adds the readme from the docs to the help page instead of the current links.

Fixes #1117
2014-05-29 11:33:54 +00:00
Marin Jankovski 3910b5917c Extend default link_to helper to add noreferrer html_option. 2014-05-29 12:49:15 +02:00
GitLab 631eb0420c No need to copy the unicorn file if you use the cookbook. 2014-05-29 12:33:14 +02:00
Marin Jankovski 17a696a98b We need shortcuts route. 2014-05-29 12:01:34 +02:00
Sytse Sijbrandij 749d198f10 Merge branch 'deprecate_ruby_1.9.3' into 'master'
Deprecate ruby 1.9.3

Fixes #1106
2014-05-29 08:19:07 +00:00
Marin Jankovski dfaf1a0992 Add deprecation to changelog. 2014-05-29 10:15:54 +02:00
Marin Jankovski 2dbf1a00a9 Ruby 2.0+ is a requirement. 2014-05-29 10:15:14 +02:00
Marin Jankovski 0879babfd1 Fix feature. 2014-05-29 10:13:30 +02:00