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
Marin Jankovski
68f7302474
Add a scope for visible services, code styling changes for easier readability.
2015-01-28 14:25:55 -08:00
Marin Jankovski
c6c7552e41
Build the urls inside of the service.
2015-01-28 13:19:32 -08:00
Marin Jankovski
537cd66d7e
Add gitlab internal issue tracker service.
2015-01-28 09:28:17 -08: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
Dmitriy Zaporozhets
e13868fa69
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-01-27 12:48:07 -08:00
Dmitriy Zaporozhets
b35f1d1c2f
Increase font size for issue/mr titles
2015-01-27 12:47:39 -08:00
Marin Jankovski
95db00c3e9
Still need the javascript on the project edit page.
2015-01-27 12:19:32 -08:00
Dmitriy Zaporozhets
8933149b9e
Merge branch 'add_titles_to_links' into 'master'
...
Add titles to all nav links
See merge request !313
2015-01-27 19:41:46 +00:00
Dmitriy Zaporozhets
2fa36ddd9c
Replace p with h4 for empty repo text
2015-01-27 11:32:28 -08:00
Sytse Sijbrandij
94381704d1
Merge branch 'active-users-and-logged-in-users' into 'master'
...
Active users and logged in users
/cc @marc @haydn @dzaporozhets
See merge request !1443
2015-01-27 18:37:00 +00:00
Valery Sizov
79ca8146f3
Merge branch 'github-no-omniauth' into 'master'
...
Don't require omniauth to enable github importer
I noticed the github importer is only enabled when omniauth authentication is also enabled. That isn't actually necessary -- just the oauth keys from GitHub are required to be configured.
The fix for this is very simple.
See merge request !316
2015-01-27 18:33:09 +00:00
Dmitriy Zaporozhets
6182f1cabf
Use larger avatar on application header
2015-01-27 09:48:42 -08:00
Sytse Sijbrandij
233f9f0766
Prevent confusion between active users and 30 day users.
2015-01-27 09:35:46 -08:00
Boyan Tabakov
93bc2d5202
Added support for firing system hooks on group create/destroy and adding/removing users to group.
...
Added tests and updated docs. Also adding 'user_id' field in the hooks for adding/removing user from team.
2015-01-27 09:25:28 +02:00
Marin Jankovski
ededa98995
Shorter check in services controller.
2015-01-26 22:46:54 -08:00
Dmitriy Zaporozhets
65e88f1e1a
Fixed few tests and improved css style
2015-01-26 22:39:48 -08:00
Marin Jankovski
0da59cb55b
Merge branch 'master' into move_external_issue_tracker_away_from_yml_config
...
Conflicts:
app/models/project.rb
spec/models/project_spec.rb
2015-01-26 22:12:53 -08:00
Marin Jankovski
33913f9b8f
Make issue tracker service fields required.
2015-01-26 22:08:27 -08:00
Dmitriy Zaporozhets
8ecf7d3207
Improve web editor filename placeholder
2015-01-26 20:58:38 -08:00
Dmitriy Zaporozhets
a3d879d427
Refactor web editor
2015-01-26 20:57:42 -08:00
Dmitriy Zaporozhets
aac36b120e
Fix app title when browse blob
2015-01-26 19:28:11 -08:00
Dmitriy Zaporozhets
e6b97d0947
Improve font sizes for code and diff
2015-01-26 18:56:56 -08:00
Dmitriy Zaporozhets
0f52d25961
Merge branch 'init-from-ui' into 'master'
...
File creation and editing refactored
* Refactored controllers/helpers/views related to blob resource
* make it possible to create new file in empty repository
Second step in building #1930
See merge request !1440
2015-01-27 02:45:54 +00:00
Marin Jankovski
00a0d5aeea
Move repetition to the parent.
2015-01-26 16:24:11 -08:00
Dmitriy Zaporozhets
79915528d8
Merge branch 'bigger-font' into 'master'
...
Bigger font-size for code browsing
See merge request !1439
2015-01-27 00:08:30 +00:00
Marin Jankovski
4641514cbf
Update rspec tests to the new external issue logic.
2015-01-26 15:59:40 -08:00
Dmitriy Zaporozhets
2b8b060236
Make code font size a bit bigger so its easier to read it
2015-01-26 15:15:51 -08:00
Dmitriy Zaporozhets
ed91378627
Fix blob controller rendering in case of errors
2015-01-26 15:12:13 -08:00
Dmitriy Zaporozhets
752cb506c0
Refactor blob views
2015-01-26 15:03:30 -08:00
Dmitriy Zaporozhets
21297e78af
Refactor blob helpers
2015-01-26 15:03:14 -08:00
Dmitriy Zaporozhets
59b08942aa
Refactor blob controllers
2015-01-26 15:02:28 -08:00
Dmitriy Zaporozhets
c916124178
Explicitly set before_filter for ref-related controllers
2015-01-26 15:01:51 -08:00
Dmitriy Zaporozhets
6a2384e0bc
Make draft UI for creating new file in empty repository
2015-01-26 13:37:18 -08:00
Dmitriy Zaporozhets
3e47ea5064
Files::CreateService can now commit file to empty repository
2015-01-26 13:31:24 -08:00
Marco Wessel
05b6bb4bf7
Don't require omniauth to be enabled, to use github importer
2015-01-26 21:25:13 +01:00
Marin Jankovski
65e700472b
Update the issue tracker attribute on issue tracker change.
2015-01-26 11:39:32 -08:00
Dmitriy Zaporozhets
e20dba0299
Redesign way how project avatar displayed on project page
2015-01-26 00:23:16 -08:00
Dmitriy Zaporozhets
Hannes Rosenögger
Marin Jankovski
Visay Keo
Dmitriy Zaporozhets
Sytse Sijbrandij
Valery Sizov
Boyan Tabakov
Marco Wessel