Sytse Sijbrandij
ee804e2d94
Better English in the performance diff message.
2015-02-14 12:13:31 -08:00
Dmitriy Zaporozhets
f989190ed4
Show tooltips on collapsed sidebar
2015-02-13 13:36:59 -08:00
Dmitriy Zaporozhets
f91767db3d
Merge branch 'oauth-password-http' into 'master'
...
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S)
See #1982 .
There's a similar tooltip for SSH: "Add an SSH key to your profile to pull or push via SSH". These are always shown on-hover, even if the persistent flash above was hidden.
cc @sytse
See merge request !1512
2015-02-13 18:12:05 +00:00
Dmitriy Zaporozhets
4d9756c1e8
Merge branch 'username-namespace-clash' into 'master'
...
Prevent autogenerated OAuth username to clash with existing namespace.
If the OAuth username already exists as a group rather than a user, automatic account creation would still fail.
See merge request !1511
2015-02-13 18:08:53 +00:00
Dmitriy Zaporozhets
c676856f1b
Merge branch 'test_settings' into 'master'
...
Test settings for issue tracker service
This adds minimum logging and response when using "test settings" button when the service is enabled.
See merge request !1506
2015-02-13 17:59:03 +00:00
Dmitriy Zaporozhets
b8cc501c3e
Merge branch 'add_tracker_integration_doc' into 'master'
...
Add tracker integration doc and help page on service
Added documentation on how to enable tracker integration. Fix the active link on the admin page. Added help under the JIRA service page.
See merge request !1508
2015-02-13 17:57:39 +00:00
Dmitriy Zaporozhets
917ae13bf8
Merge branch 'signin-page-headings' into 'master'
...
Add headings to signin/signup blocks on signin page.
See #1986
When signup is disabled, the heading for sign in only reads "Sign in", because there is no longer a choice of Existing/New user.
I've moved the OAuth signin options to just below the signin box because it looked odd as a separate box without a heading.
cc @sytse
See merge request !1516
2015-02-13 17:43:17 +00:00
Dmitriy Zaporozhets
2f9661dcd3
Merge branch 'dashboard-new-project' into 'master'
...
Add "New Project" button to dashboard projects page.
See merge request !1518
2015-02-13 17:41:25 +00:00
Douwe Maan
055c2f1e33
Add "New Project" button to dashboard projects page.
2015-02-13 15:43:02 +01:00
Douwe Maan
7c39e728ef
Move OAuth signin options just below signin box.
2015-02-13 15:16:17 +01:00
Douwe Maan
da1608196b
Add headings to signin/signup blocks on signin page.
2015-02-13 15:16:00 +01:00
Douwe Maan
25e44d0530
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).
2015-02-13 14:44:42 +01:00
Douwe Maan
34cc4c5982
Link head panel titles to relevant root page.
2015-02-13 14:31:51 +01:00
Douwe Maan
161d15541a
Prevent autogenerated OAuth username to clash with existing namespace.
2015-02-13 12:39:11 +01:00
Marin Jankovski
eccf695640
Explained in the integration documentation how to enable external issue tracker
2015-02-12 17:06:55 -08:00
Dmitriy Zaporozhets
2ff1b8e68d
Merge branch 'clean-oauth-username' into 'master'
...
Clean username acquired from OAuth/LDAP.
Fixes #1967 .
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/813
See merge request !1500
2015-02-13 00:39:34 +00:00
Dmitriy Zaporozhets
f9880c11f7
Merge pull request #8779 from KelvinMutuma/show-assignees-in-merge-requests-index
...
Show assignees in the merge-requests index
2015-02-12 14:46:41 -08:00
Marin Jankovski
8a37435738
Fix rubocop error.
2015-02-12 13:21:47 -08:00
Marin Jankovski
1a89db5ffb
Try to test settings added in the service.
2015-02-12 13:02:58 -08:00
Sytse Sijbrandij
e629c45d88
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-02-12 12:09:38 -08:00
Douwe Maan
6685661b54
Clean username acquired from OAuth/LDAP.
...
Fixes #1967 .
2015-02-12 21:05:27 +01:00
Dmitriy Zaporozhets
714ca5189e
Merge branch 'issues_tracker_template' into 'master'
...
Issues trackers template
If admin defines service template, service in project will be prefilled with the template data.
See merge request !1503
2015-02-12 20:02:23 +00:00
Marin Jankovski
e8271226b1
Use the service_name.
2015-02-12 10:57:08 -08:00
Marin Jankovski
9f33898f7a
All services can have templates.
2015-02-12 09:19:55 -08:00
Dmitriy Zaporozhets
cab72628ff
Merge branch 'master' into 'master'
...
Adds new label color suggestions
This adds a bunch of label color suggestions
See merge request !289
2015-02-12 07:17:46 +00:00
Kelvin Mutuma
783ecc9a2f
Show Work In progress if a merge request is not assigned
2015-02-12 05:59:38 +03:00
Kelvin Mutuma
e3ecdb4810
Show assignees in the merge-requests index
2015-02-12 05:41:47 +03: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
e71805db8a
Merge branch 'ssh-link' into 'master'
...
Fix link to SSH help page.
Closes #1981 .
See merge request !1502
2015-02-11 23:34:24 +00:00
Dmitriy Zaporozhets
36bbd5affb
Merge branch 'mobile-maximum-scale-1' into 'master'
...
Don't allow page to be scaled on mobile and add horizontal scrolling to code blocks
Closes #1974 .
Previously, scaling (both automatically and manually) was enabled on mobile, which caused the top and sidebar to move over content. Scaling is now disabled.
Also previously, code in issues or comments too wide to fit inside the width of the window would "flow out" on the right, causing the whole page to become very wide and causing scrolling to scroll the entire page instead of just the code. Code blocks now scroll themselves.
See merge request !1501
2015-02-11 22:08:22 +00:00
Dmitriy Zaporozhets
d1ad5b5378
Merge branch 'fix-command-enter' into 'master'
...
Actually submit comment on command-enter.
Resolves #1869 .
Because !1474 didn't actually work.
cc @sytse
See merge request !1499
2015-02-11 21:56:44 +00:00
Douwe Maan
452b3612cf
Fix link to SSH help page.
...
Closes #1981 .
2015-02-11 22:15:10 +01:00
Marin Jankovski
09d3d351a1
Remove not null constraint on project_id in services.
2015-02-11 09:47:21 -08:00
Marin Jankovski
5515366064
Add template boolean to services.
2015-02-11 09:24:40 -08:00
Marin Jankovski
29e606deec
Add ExternalIssue base model to make issue referencing more robust for external issue trackers.
2015-02-11 09:21:57 -08:00
Douwe Maan
27e521720a
Add horizontal scrolling to code blocks.
2015-02-11 17:40:03 +01:00
Douwe Maan
d909ae73dc
Actually submit comment on command-enter.
...
Resolves #1869 .
2015-02-11 12:21:11 +01:00
Benjamin Kammerl
7606b93c26
Change label color text field type to "color"
2015-02-11 10:02:36 +00:00
Dmitriy Zaporozhets
3c4f7f50fa
Merge branch 'add_label_notes' into 'master'
...
Add label notes
It creates system note, when someone changed labels of issue/MR.
Just look at the screenshot:
Solves this [request] (http://feedback.gitlab.com/forums/176466-general/suggestions/6623258-create-a-note-when-issue-labels-change ).
*P.S. Thanks this [PR](https://github.com/gitlabhq/gitlabhq/pull/8237 ) for idea 😉 . But I need this feature as soon as possible.*
See merge request !331
2015-02-11 01:34:33 +00:00
Dmitriy Zaporozhets
3d369a5b85
Remove settings from gitlab.yml.example which we already have in UI
2015-02-10 09:30:39 -08:00
Marin Jankovski
00c7d533a0
Default issue tracker fix for creating default issue service.
2015-02-09 14:33:47 -08:00
Douwe Maan
8752cd3322
Don't allow page to be scaled on mobile.
2015-02-09 18:11:06 +01:00
Dmitriy Zaporozhets
3e4e5f7063
Merge branch 'improve-oauth-ux' into 'master'
...
Improve OAuth UX
See merge request !1489
2015-02-09 16:45:25 +00:00
Nikita Verkhovin
8681cb3137
Add labels notes
2015-02-08 22:35:41 +06:00
Dmitriy Zaporozhets
0a34f2dcb5
Merge pull request #8580 from j0k3r/asana
...
Add Asana service
2015-02-08 01:12:41 -08:00
Dmitriy Zaporozhets
fa3a7ef037
Merge pull request #8740 from cinderblock/master
...
Be less restrictive on key comment extraction
2015-02-08 01:07:23 -08:00
Dmitriy Zaporozhets
8c12c93e07
Merge pull request #8749 from sashkab/b8748-emailheader
...
Addex X-GitLab-Project header to GitLab emails.
2015-02-08 01:06:38 -08:00
Dmitriy Zaporozhets
03c8bf39e1
When add new social account - redirect to accounts page and show notice message
2015-02-08 00:53:31 -08:00
Sytse Sijbrandij
Dmitriy Zaporozhets
Dmitriy Zaporozhets
Douwe Maan
Marin Jankovski
Kelvin Mutuma
Benjamin Kammerl
Nikita Verkhovin
