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
Sytse Sijbrandij
e629c45d88
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-02-12 12:09:38 -08: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
Dmitriy Zaporozhets
64673acf9f
Merge branch 'duduribeiro-fix_showing_overflow' into 'master'
...
Fix project sidebar overflow small screens
See merge request !1488
2015-02-08 03:43:01 +00:00
Dmitriy Zaporozhets
c5a16b8c60
Merge branch 'autosave' into 'master'
...
Autosave and autorestore unsaved comments.
Closes #1738 .
See merge request !1480
2015-02-08 02:45:20 +00:00
Dmitriy Zaporozhets
6729e4cfc2
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2015-02-07 18:42:53 -08:00
Dmitriy Zaporozhets
3cd036e315
Merge branch 'notification_email'
...
Conflicts:
db/schema.rb
2015-02-07 18:42:34 -08:00
Dmitriy Zaporozhets
377d461f26
Merge branch 'import-all-projects' into 'master'
...
Add "Import all projects" button to GitHub and GitLab import pages.
Closes #1963 .
See merge request !1482
2015-02-08 02:39:29 +00:00
Dmitriy Zaporozhets
e3a9bb8026
Merge branch 'fix_showing_overflow' of https://github.com/duduribeiro/gitlabhq into duduribeiro-fix_showing_overflow
2015-02-07 18:32:13 -08:00
Carlos Ribeiro
eef461d4a1
Fix showing overflow when have several items at sidebar
2015-02-07 21:35:44 -02:00
Douwe Maan
9dbd7e5aec
Allow notification email to be set separately from primary email.
...
Closes #1932 .
2015-02-07 23:19:17 +01:00
Douwe Maan
db7921f2d8
Add "Import all projects" button to GitHub and GitLab import pages.
...
Closes #1963 .
2015-02-07 23:15:04 +01:00
Dmitriy Zaporozhets
9a3afa4d19
Merge branch 'refactor-avatars' into 'master'
...
Refactor avatars css
See merge request !1487
2015-02-07 21:26:26 +00:00
Douwe Maan
463d9f76e4
Autosave and autorestore unsaved comments.
...
Closes #1738 .
2015-02-07 20:55:17 +01:00
Dmitriy Zaporozhets
72cf8173ad
Merge branch 'clean-up-devise-views' into 'master'
...
Clean up devise views
See merge request !1472
2015-02-07 19:50:15 +00:00
Dmitriy Zaporozhets
f228e17d39
Add project-avatar and group-avatar css classes
2015-02-07 11:38:58 -08:00
Aleks Bunin
36b255e57b
Addex X-GitLab-Project header to GitLab emails.
...
Fixes #8748 .
2015-02-07 12:35:50 -05:00
Dmitriy Zaporozhets
4cce10583d
Fix tests for semaphore
2015-02-06 23:57:28 -08:00
Dmitriy Zaporozhets
89f8020fe1
Merge branch 'mention-groups'
...
Conflicts:
CHANGELOG
2015-02-06 16:45:37 -08:00
Dmitriy Zaporozhets
3e97ac2022
Add index on order columns
2015-02-06 10:21:48 -08:00
Dmitriy Zaporozhets
dd8dd92e50
Merge branch 'api-default-order' into 'master'
...
Sorting refactoring
* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope
See merge request !1476
2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets
6b61c90498
Merge branch 'markdown-preview-via-post' into 'master'
...
Don't have Markdown preview fail for long comments/wiki pages.
See https://github.com/gitlabhq/gitlabhq/issues/8611 .
See merge request !1479
2015-02-06 17:55:30 +00:00
Dmitriy Zaporozhets
Sytse Sijbrandij
Dmitriy Zaporozhets
Marin Jankovski
Kelvin Mutuma
Douwe Maan
Benjamin Kammerl
Nikita Verkhovin
Carlos Ribeiro
Aleks Bunin
