Age | Commit message (Collapse) | Author |
|
Make dropdowns on new issue page consistent
See merge request !13584
|
|
|
|
Make create merge request / branch dropdown on issue page style consistent
See merge request !13457
|
|
|
|
# Conflicts:
# app/models/issue.rb
|
|
|
|
|
|
Added by
https://gitlab.com/gitlab-org/gitlab-ee/commit/88aea2cbc8633ba970335d935d725bd17654b424
Part of this MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797/
|
|
|
|
|
|
|
|
|
|
|
|
Render Description Realtime :tada:
Closes #25049 and #31355
See merge request !10865
|
|
for timing on animation
|
|
|
|
|
|
Closes #31228
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'master'
Update snippets UI
## What does this MR do?
Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849.
## Are there points in the code the reviewer needs to double check?
Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective.
## Why was this MR needed?
## Screenshots (if relevant)
![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png)
![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png)
![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #18849
See merge request !6210
|
|
Fixed issue merge-request-info missing on mobile
## What does this MR do?
Removed media query declaration relating to `.merge-request-info` and `.issue-info`.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Mobile UX
## Screenshots (if relevant)
![Screen_Shot_2016-09-07_at_19.10.39](/uploads/6dc39b72459087826071ba9fbd06da17/Screen_Shot_2016-09-07_at_19.10.39.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #21877
See merge request !6250
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Rearranged datetime created line
Added `avatar_class` option to `link_to_member` so it can be hidden
Made snippet title font heavier
Added file title bar
Hidden unneeded info from xs screens
Added visibility icon
Reveal file-actions on xs screens
Added comments icon to snippets list items
Refactored no-comments declaration into framework stylesheet
Final touch ups
Fixed snippets_spec
|
|
|
|
Commit message blocks
#### What does this MR do?
* Wraps code commit message blocks
* Consolidates similar shades of gray (cc @cperessini @tauriedavis)
Related to #20831
#### Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-19_at_10.41.07_AM](/uploads/4529d178123e18b0aad35a252061902b/Screen_Shot_2016-08-19_at_10.41.07_AM.png)
After:
![Screen_Shot_2016-08-19_at_10.40.42_AM](/uploads/499818f360e7c3cd9d31bc335cae1a82/Screen_Shot_2016-08-19_at_10.40.42_AM.png)
See merge request !5906
|
|
|
|
|
|
* upstream/master: (620 commits)
Added '*.js.es6 gitlab-language=javascript' to .gitattributes
Fix CI status icon link underline
Update CHANGELOG after 8.10.1
Add CHANGELOG
Add es6 gem
Instrument Nokogiri parsing methods
Fix backup restore
Use project ID in repository cache to prevent stale data from persisting across projects
Add iid to MR API response
`WikiPage` should have a slug even when not persisted.
ES6ify all the things!
Make fork counter always clickable (!5463)
Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…"
Fix CHANGELOG
Add spec for dashes in paths
Fix Error 500 when creating Wiki pages with hyphens or spaces
Add links to the real markdown.md file for all GFM examples
Remove magic comments from Ruby files (!5456)
Ignore invalid trusted proxies in X-Forwarded-For header
remove search_id for label dropdown filter
...
|
|
|
|
|
|
* upstream/master: (1547 commits)
Add margin between buttons if both retry and cancel are present
Add margin between labels; remove underline hover style on status button
udpated JS based on feedback
Use default cursor for table header of project files (!5165)
Fix duplicated entry in changelog [ci skip]
Improves left static sidebar behaviour
Include default callback URL (OAuth)
Cleanup feature proposal template
Simplify regex for string-based multi-word label surrounded in quotes
Revert "Merge branch '18193-developers-can-merge' into 'master'
"
Upgrade Rails from 4.2.6 to 4.2.7.
some JS magic to fix empty URL bug
formats my test properly
Update CHANGELOG
Doesn't match empty label references surrounded in quotes
Fix markdown rendering for label references that contains `.`
Fix markdown rendering for label references that begin with a digit
Fix markdown rendering for consecutive label references
Stub omniauth provider for GitLab
Update CHANGELOG
...
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
|
|
|
|
Related merge request text alignment
Fixed the alignment of the text 'When this merge request is accepted...' on issues page
![Screen_Shot_2016-05-23_at_14.59.48](/uploads/5d2f4be94108364a9d004169a6825a9e/Screen_Shot_2016-05-23_at_14.59.48.png)
See merge request !4251
|
|
|