Dmitriy Zaporozhets
46dd5fc47e
Merge branch 'jasonblanchard-collapseable-nav' into 'master'
...
Collapseable sidebar
See merge request !1465
2015-02-03 21:56:26 +00:00
Dmitriy Zaporozhets
254a63dcf7
Improve collapsing sidebar
2015-02-03 13:11:33 -08:00
Dmitriy Zaporozhets
ded30e3efe
Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav
2015-02-03 12:05:11 -08:00
Sytse Sijbrandij
e0d85078ba
Push can be multiple files.
2015-02-03 11:23:59 -08:00
Dmitriy Zaporozhets
8618277f24
Merge branch 'issue-merge-req-context-links' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-issue-merge-req-context-links
...
Conflicts:
CHANGELOG
2015-02-03 11:22:16 -08:00
Dmitriy Zaporozhets
141c6a027e
Merge pull request #8719 from jvanbaarsen/diff-colors
...
Made diff colors a little less In Your Face
2015-02-03 10:36:53 -08:00
Valery Sizov
b9d9ac82a9
Commit page: async load branches info
...
Conflicts:
config/routes.rb
2015-02-03 09:10:56 -08:00
Jason Blanchard
ee955d7a12
Adds persistent collapse button for left side bar
2015-02-03 11:45:33 -05:00
Jason Blanchard
97d4ac4047
Adds link to milestone and keeping resource context on smaller
...
viewports for issues and merge requests
2015-02-03 11:41:32 -05:00
Jeroen van Baarsen
ae5743e9c1
Made diff colors a little less In Your Face
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-02-03 10:50:10 +01: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
Dmitriy Zaporozhets
Sytse Sijbrandij
Valery Sizov
Jason Blanchard
Jeroen van Baarsen
Robert Speicher
Hannes Rosenögger
Marin Jankovski