Commit Graph
6699 Commits
Author SHA1 Message Date
Valery Sizov b9d9ac82a9 Commit page: async load branches info
Conflicts:
	config/routes.rb
2015-02-03 09:10:56 -08:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets 7d48205c1a Rubocop: comment indentation 2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets 368e9a0862 Rubocop: Style/CaseIndentation enabled 2015-02-02 21:26:40 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00
Dmitriy Zaporozhets 9fbdbf8b3f Rubocop: Style/Alias enabled 2015-02-02 20:57:10 -08:00
Dmitriy Zaporozhets aaae5e6f5e Rubocop: Style/AccessorMethodName enabled 2015-02-02 20:55:05 -08:00
Dmitriy Zaporozhets e890582681 Rubocop enabled for: Use spaces inside hash literal braces 2015-02-02 20:36:54 -08:00
Dmitriy Zaporozhets afb8ecc3d1 Fix syntax error 2015-02-02 20:02:46 -08:00
Dmitriy Zaporozhets 4f1d1fc51b Convert hashes to ruby 1.9 style 2015-02-02 19:30:09 -08:00
Dmitriy Zaporozhets 2bd70b6a01 Improve project icons for dashboard 2015-02-02 15:47:51 -08:00
Dmitriy Zaporozhets c0acb28c4e Annotate models 2015-02-02 10:24:40 -08:00
Dmitriy Zaporozhets b7cf72f6ea Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-29 22:43:13 -08:00
Dmitriy Zaporozhets 71ebf3aa1c Merge pull request #8670 from tsigo/rs-fa-icon-helper
Add icon helper method
2015-01-29 22:42:37 -08:00
Dmitriy Zaporozhets 78d7c5087b Use tile avatars for user/group show pages 2015-01-29 17:30:51 -08:00
Dmitriy Zaporozhets 31245a40c1 Remove : from headers 2015-01-29 17:13:28 -08:00
Dmitriy Zaporozhets f1cf49218f Improve contribution calendar on user page
* cache user contributions for day
* ignore forks in calendar contribtuions
2015-01-29 17:07:44 -08:00
Dmitriy Zaporozhets a3c2873f50 Merge pull request #8676 from tsigo/rs-repository-cache
Refactor Repository to use new RepositoryCache class
2015-01-29 16:45:39 -08:00
Dmitriy Zaporozhets 5ec36902dd Fix calendar js 2015-01-29 16:00:46 -08:00
Robert Speicher 4eafc18843 Refactor Repository to use new RepositoryCache class
Abstracts away the lower-level implementation details from the
Repository model.
2015-01-29 13:03:47 -05:00
Dmitriy Zaporozhets 08582f1532 Improve user calendar authentification and tests 2015-01-29 08:55:57 -08:00
Dmitriy Zaporozhets 1f0e16569f Load contribution calendar via AJAX 2015-01-29 01:20:17 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets beb7a42548 Merge branch 'ux-fixes' into 'master'
UX improvements (Implement lessons from user testing)

* add link to permissions help page from new project/group member form
* Improve UX for widget if merge request can not be merged
* Improve wording for fork project page

See merge request !1448
2015-01-29 07:01:58 +00:00
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -08:00
Dmitriy Zaporozhets 815e9aa283 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar 2015-01-28 22:52:44 -08:00
Dmitriy Zaporozhets ef315dda5f Add light border to bootstrap panels 2015-01-28 16:59:25 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Dmitriy Zaporozhets f2f7b5a18e Better wording 2015-01-28 15:37:20 -08:00
Marin Jankovski 68f7302474 Add a scope for visible services, code styling changes for easier readability. 2015-01-28 14:25:55 -08:00
Dmitriy Zaporozhets 34b7472b33 Improve wording for fork project page 2015-01-28 14:20:00 -08:00
Marin Jankovski c6c7552e41 Build the urls inside of the service. 2015-01-28 13:19:32 -08:00
Dmitriy Zaporozhets b40809d731 Improve UX for widget if merge request can not be merged 2015-01-28 11:25:13 -08:00
Dmitriy Zaporozhets 965cec68ac Project/Group access dropdown should contain link to permissions help page 2015-01-28 10:53:28 -08:00
Marin Jankovski 537cd66d7e Add gitlab internal issue tracker service. 2015-01-28 09:28:17 -08:00
Robert Speicher 4e7a4cd956 Use icon helper method in helper modules 2015-01-28 03:48:18 -05:00
Robert Speicher fe831dcd6f Move spinner helper into IconsHelper
Also updates it to use the new `icon` method.
2015-01-28 03:37:44 -05:00
Robert Speicher 8633bbc9b8 Add icon helper method 2015-01-28 03:37:44 -05:00
Dmitriy Zaporozhets 8eb365c0a0 Separate admin settings from other links 2015-01-27 22:54:46 -08:00
Dmitriy Zaporozhets f79f758581 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-27 22:51:36 -08:00
Dmitriy Zaporozhets 50297f7134 Fix gravatar size for head panel icon 2015-01-27 22:51:11 -08:00
Visay Keo 35d6d1ce46 Fix broadcast message to show up properly with new UI
With the new UI, the broadcast message is the first level child element
of the body tag and then render full width without respecting the width
of the left sidebar. This makes the message goes under the left sidebar
in smaller screen.

This commit fixes the issue by moving the message element into the
"page-with-sidebar" div so it will always render together with the main
content area with same look as before. The rendering for the search,
login and other view without left sidebar remains untouched.

Releases: master, 7-7-stable
Fixes: #1019
2015-01-28 07:24:05 +07:00
Dmitriy Zaporozhets f57bffc82a Merge branch 'init-from-ui' into 'master'
Add tests for creating bare repo and first file in UI

Part of #1930

See merge request !1444
2015-01-27 21:27:59 +00:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'
Move external issue tracker away from yml config

See merge request !1442
2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets e9514c5074 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-27 12:51:42 -08:00
Dmitriy Zaporozhets 0d86a1a3d4 Merge pull request #8638 from hiroponz/remember-project-default-tab-30days
Remember the project default tab for 30 days
2015-01-27 12:50:20 -08:00
Dmitriy Zaporozhets 6d034e5f53 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-27 12:49:44 -08:00
Dmitriy Zaporozhets 5e20cb82d7 Merge pull request #8652 from bladealslayer/feature/system_hook_for_groups
Added support for firing system hooks on group create/destroy and adding...
2015-01-27 12:49:24 -08:00