Dmitriy Zaporozhets
be3edeb6a1
Small UI improvements after css refactoring
2015-03-07 10:35:17 -08:00
Dmitriy Zaporozhets
3bfd53149c
Replace bs-callout with alert
2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets
cf4fcf2521
Merge branch 'fix-checkbox-align' into 'master'
...
Fix checkbox alignment in application settings
Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels. See #2053 .
Also add aria-describedby attributes to form controls that have a help text block (http://getbootstrap.com/css/#callout-help-text-accessibility ).
## Before
---
## After
---
This doesn't address the help text block for the twitter checkbox. @dzaporozhets Do you want to keep the help text visible or would you rather put it in a dialog and hide it initially?
cc @sytse
See merge request !1615
2015-03-05 18:01:55 +00:00
Douwe Maan
d57e809cbd
Set supported events per project service.
2015-03-03 11:14:32 +01:00
Vinnie Okada
38c52b1be6
Fix checkbox alignment in application settings
...
Add the form-control CSS class to the feature checkboxes on the
application settings page to fix the vertical alignment with their
labels. Also add aria-describedby attributes to form controls that have
a help text block.
2015-03-02 16:36:07 -07:00
Dmitriy Zaporozhets
519ca7bae9
Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button
...
Conflicts:
app/views/shared/_issuable_filter.html.haml
2015-03-02 15:28:22 -08:00
Mlanawo Mbechezi
9e4d3f328f
fix typo
2015-02-27 22:49:40 +01:00
Dmitriy Zaporozhets
1da71cc520
Introduce shortcuts for routing helpers
2015-02-25 19:34:16 -08:00
Dmitriy Zaporozhets
f43c0429c2
Improve admin projects and users pages for mobile devices
2015-02-24 21:31:54 -08:00
Vinnie Okada
9e9ce95d62
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets
ee26dae63e
Update bootstrap-sass gem
2015-02-19 15:02:49 -08:00
Dmitriy Zaporozhets
9eef14279f
Merge branch 'oauth-dup' into 'master'
...
Fix duplicate authorized applications
On the profile applications page, display one row per authorized app instead of one row per access token. See #1987 .
cc @sytse
See merge request !1524
2015-02-16 23:08:50 +00:00
Vinnie Okada
e0f61a59b4
Use shorter map() syntax
2015-02-15 20:50:53 -07:00
Dmitriy Zaporozhets
2ad00f5294
Merge branch 'tweet-new-project'
...
Conflicts:
db/schema.rb
2015-02-15 19:03:10 -08:00
Vinnie Okada
9e0467c38e
Fix application client count
...
Display the number of unique users with an access token instead of the
total number of access tokens per application in the admin area.
2015-02-15 15:53:33 -07:00
Vinnie Okada
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Douwe Maan
ce08f919bf
Add link to share via twitter to "created project" event.
2015-02-13 12:07:59 +01:00
Marin Jankovski
eccf695640
Explained in the integration documentation how to enable external issue tracker
2015-02-12 17:06:55 -08:00
Marin Jankovski
9f33898f7a
All services can have templates.
2015-02-12 09:19:55 -08:00
Marin Jankovski
f7e9024535
Remove unecessary icon.
2015-02-11 18:36:40 -08:00
Marin Jankovski
b3f944a398
Annotate services. Add a link to service template.
2015-02-11 18:29:24 -08:00
Marin Jankovski
6b4ddf2cc1
Add admin services templates.
2015-02-11 17:55:33 -08:00
Dmitriy Zaporozhets
3d369a5b85
Remove settings from gitlab.yml.example which we already have in UI
2015-02-10 09:30:39 -08:00
Dmitriy Zaporozhets
bbca6a0abd
Refactor sorting in project
2015-02-05 19:15:05 -08:00
Dmitriy Zaporozhets
a8b4756f29
Merge branch 'mwessel/gitlab-ce-configure-protection' into 'master'
...
Mwessel/gitlab ce configure protection
See merge request !1467
2015-02-04 04:25:07 +00:00
Sytse Sijbrandij
7b233ea853
Spelling improvement, add in a group, not into group.
2015-02-03 16:55:31 -08:00
Marco Wessel
20e269cb92
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
...
Conflicts:
CHANGELOG
db/schema.rb
2015-01-30 00:16:24 +01:00
Sytse Sijbrandij
233f9f0766
Prevent confusion between active users and 30 day users.
2015-01-27 09:35:46 -08:00
Marco Wessel
aad6ceaef9
Allow configuring protection of the default branch upon first push
2015-01-25 17:09:10 +01:00
Valery Sizov
1809b3ee36
Spinach for admin applications
2015-01-19 11:18:00 -08:00
Dmitriy Zaporozhets
7d5d5e53b1
Merge branch 'doorkeeper_applications_scafold'
2015-01-17 16:17:45 -08:00
Dmitriy Zaporozhets
a81081aa72
Small improvements to CI
2015-01-17 16:17:34 -08:00
Valery Sizov
20028523b5
Application admin scaffold
2015-01-17 15:40:09 -08:00
Ciro Santilli
55d9809055
Convert Javascript links to buttons.
2015-01-17 19:50:41 +01:00
Dmitriy Zaporozhets
e7f772550c
Add tests to home page url redirect
2015-01-16 16:09:20 -08:00
Dmitriy Zaporozhets
41d7be3ce1
Allow to specify home page for non logged-in users
2015-01-16 16:01:15 -08:00
Dmitriy Zaporozhets
41f09bed82
Re-order admin dashboard
2015-01-15 15:19:04 -08:00
Dmitriy Zaporozhets
08c9cb4cab
Finally fix stuff related to dynamic config
2015-01-08 14:26:43 -08:00
Dmitriy Zaporozhets
57a65ede77
Improve application settings and write tests
2015-01-08 09:53:35 -08:00
Dmitriy Zaporozhets
8589b4e137
Init ApplicationSettings resource with defaults from config file
2015-01-08 00:22:50 -08:00
Marin Jankovski
607ea7c6e5
Share the key table between admin and profile resources.
2014-12-30 11:01:30 +01:00
Marin Jankovski
82829ed49e
Move user key manipulation in admin section to a separate controller.
2014-12-30 10:15:11 +01:00
Marin Jankovski
f0085d034b
Reuse show page for user keys.
2014-12-29 17:09:39 +01:00
Marin Jankovski
492f3a4779
Add user key actions to admins.
2014-12-29 17:07:23 +01:00
Dmitriy Zaporozhets
1f2628fe21
Allow Group path to be changed at the same time as name
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-22 15:02:47 +02:00
Dmitriy Zaporozhets
e1f1e062a8
Merge branch 'multi_provider' into 'master'
...
Supporting for multiple omniauth provider for the same user
fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721
and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760
See merge request !1296
2014-12-04 16:03:04 +00:00
Valery Sizov
3a5ed5260b
Supporting for multiple omniauth provider for the same user
2014-12-04 13:03:55 +02:00
Dmitriy Zaporozhets
d80a59c7b1
Create helper for sort drowdown option names
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-04 12:10:38 +02:00
Dmitriy Zaporozhets
b23b78ada1
Merge pull request #7866 from cirosantilli/input-button-to-tag
...
Use button type=submit instead of input.
2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets
f4178f9601
Merge pull request #8005 from cirosantilli/settings-to-gitlab-config
...
Use Gitlab.config instead of Settings everywhere
2014-10-27 19:18:48 +02:00
Dmitriy Zaporozhets
Dmitriy Zaporozhets
Douwe Maan
Vinnie Okada
Mlanawo Mbechezi
Marin Jankovski
Sytse Sijbrandij
Marco Wessel
Valery Sizov
Ciro Santilli
Valery Sizov
