home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,795 Commits 48 Branches 340 Tags
720ef51bd97f478dba2d2c1b59df958dabd7500a
Commit Graph
6856 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2fdf928afa Merge branch 'ci-setup-info' into 'master' 
Add links to CI setup documentation from project settings and builds pages

For #14483 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3384
 2016-03-26 09:57:47 +00:00
Dmitriy Zaporozhets 1853d71543 Fix link colors by using content-list for commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:40:51 +01:00
Dmitriy Zaporozhets 9e7e2c6b9d Small refactoring and rewording 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 13:18:55 +01:00
Alfredo Sumaran 35ef7ff6cb Fix link when issuable is new 2016-03-24 14:40:20 -05:00
Alfredo Sumaran 7f43049012 Fix cancel link on issuable edit form 2016-03-24 14:29:09 -05:00
Douglas Barbosa Alexandre 39a51f9e1c Rename Event#proper? to Event#visible_to_user? 2016-03-24 14:24:22 -03:00
Jacob Schatz c87adc4e4d Merge branch 'sidebar-bold-fix' into 'master' 
Fixed bold in sidebar

![Screen_Shot_2016-03-23_at_12.01.54](/uploads/d50ae3426efcb2436b3debdd80073b2f/Screen_Shot_2016-03-23_at_12.01.54.png)

This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289

See merge request !3358
 2016-03-24 14:33:00 +00:00
Jacob Schatz f565e126d2 Merge branch 'fix-password-settings-regressions' into 'master' 
Shows password form when signed in with linked account

Closes #14379

Doing this to get the builds passing for !3325

See merge request !3381
 2016-03-24 14:26:50 +00:00
Dmitriy Zaporozhets 3b1543cd15 Detect build setup state based on gitlab_ci.yml presense 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 15:17:13 +01:00
Dmitriy Zaporozhets d21b3a0211 Add links to CI setup documentation from project settings and builds pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 14:16:21 +01:00
Zeger-Jan van de Weg 221c917c6c Add tooltip to new branch button 2016-03-24 13:00:33 +01:00
Phil Hughes 4d7671e74d HAML style fix 2016-03-24 11:38:00 +00:00
Phil Hughes 6a5b3a5c8f Shows password form when signed in with linked account 
Closes #14379
 2016-03-24 11:22:44 +00:00
Jacob Schatz 4a4a79aa9e Merge branch 'dropdown-alignment-fixes' into 'master' 
Dropdown pixel perfect 🎉

Closes #14333, #14331, #14472, #14515 

See merge request !3337
 2016-03-23 22:13:31 +00:00
Jacob Schatz 4798b927ab Merge branch 'issue_7959' into 'master' 
Crop avatars on the client before upload

<img src="/uploads/535d69956cc5904870ae5d95132a35af/Screen_Shot_2016-03-17_at_9.55.56_AM.png" width="700">

closes #7959
closes #600 

See merge request !3270
 2016-03-23 20:29:30 +00:00
Robert Speicher f49e9e8f77 Merge branch 'update-issues-tests' into 'master' 
Multi-update issues tests

There were no tests for updating multiple issues at a time - this fixes
that 👍 

See merge request !3357
 2016-03-23 19:59:42 +00:00
Jacob Schatz 00246d3f01 Merge branch 'fix_missing_tooltip_next_to_project_title' into 'master' 
Fix missing tooltip in project title

closes #14516 

![tooltip](/uploads/121cc3676f4f32044e158cf5f3df5be5/tooltip.gif)

See merge request !3351
 2016-03-23 19:16:05 +00:00
Robert Speicher 33b1bbba67 Merge branch 'fix-application-settings' into 'master' 
Fixed error with applications delete anonymous token form

Closes #14509 

See merge request !3362
 2016-03-23 18:12:01 +00:00
Jacob Schatz 384a82f1a3 Merge branch 'dropdown-right-align' into 'master' 
Dropdown alignment

Hopefully the JS will stop this happening in future as well!

Closes #14386 

![Screen_Shot_2016-03-18_at_12.54.32](/uploads/d11b51d3577df3a19b8b3a0fd7b69788/Screen_Shot_2016-03-18_at_12.54.32.png)

See merge request !3298
 2016-03-23 15:24:21 +00:00
Phil Hughes c23d9ab4ed Fixed error with applications delete enonymous token form 
Closes #14509
 2016-03-23 13:59:54 +00:00
Phil Hughes 7eaad6e46a Fixed bold in sidebar 2016-03-23 12:02:07 +00:00
Phil Hughes 23bfa7a3bd Update milestone spec 2016-03-23 11:45:24 +00:00
Phil Hughes 84f124a14f Assignee tests 2016-03-23 11:19:32 +00:00
Phil Hughes 7e2806a123 Added tests for setting multiple status on issues 2016-03-23 11:19:32 +00:00
Phil Hughes aec0e22669 Adjusted alignment for the new label form 2016-03-23 10:40:07 +00:00
Douwe Maan 3b39ce3252 Merge branch 'notifications-for-subscribers-confidential-issue-labels' into 'master' 
Restrict notifications for confidential issues

Closes #14468 

/cc @rymai 

See merge request !3334
 2016-03-23 10:34:20 +00:00
Arinde Eniola b1a93fffac fix missing tooltip in project title 2016-03-22 22:54:34 +01:00
Jacob Schatz 62ffdbeb2d Merge branch 'merge-request-sidebar' into 'master' 
Fixed bug where participants would not work correctly on merge requests

Also fixed alignment bug with can't merge badge

Closes #14478, #14494

See merge request !3329
 2016-03-22 20:37:31 +00:00
Jacob Schatz 5a349efcab Merge branch 'header-mobile-overflow' into 'master' 
Fixes issue with signin button overflowing on mobile

Closes #14477

![Screen_Shot_2016-03-22_at_13.52.51](/uploads/7c9b2c38be7d497c690a7d17ae0ca76d/Screen_Shot_2016-03-22_at_13.52.51.png)

![Screen_Shot_2016-03-22_at_13.52.43](/uploads/8b2432aeb4afec455286fced11c5490c/Screen_Shot_2016-03-22_at_13.52.43.png)

See merge request !3342
 2016-03-22 20:33:07 +00:00
Jacob Schatz fb1a7553c7 Merge branch 'issue_13885' into 'master' 
Display nav controls on mobile

Set inputs inside .nav-controls to full-width on viewports below 600px

Fixes #13885

**Affected pages**


/dashboard/groups

/admin/builds

/dashboard/projects

/dashboard/issues

/dashboard/merge_requests

/dashboard/milestones

/dashboard/todos

/explore

/groups/{group-name}/issues

/groups/{group-name}

/groups/{group-name}/milestones

/{group-name}/{project-name}/builds

/{group-name}/{project-name}/forks

/{group-name}/{project-name}/issues

/{group-name}/{project-name}/labels

/{group-name}/{project-name}/merge_requests

/{group-name}/{project-name}/milestones

/{group-name}/{project-name}/wikis/home

/{group-name}/{project-name}/wikis/pages


Some Screenshots

**Groups**

![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png)


**Admin > Builds**

![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png)


**TODOs**

![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png)

**Dashboard > Projects**

![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png)


**Project Issues**

![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png)


**Project Merge Requests**

![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png)


See merge request !3214
 2016-03-22 19:49:46 +00:00
Jacob Schatz 5b2ce9adb4 Merge branch 'label-dropdown-errors' into 'master' 
Shows error messages when trying to create label in dropdown menu

Closes #14495

![Screen_Shot_2016-03-22_at_14.46.10](/uploads/cdcaa51f4d41237f8027efbd0f894bcd/Screen_Shot_2016-03-22_at_14.46.10.png)

See merge request !3345
 2016-03-22 19:45:25 +00:00
Jacob Schatz 4896d49a25 Merge branch 'fix-milestone-assign' into 'master' 
Fixes issue with assign milestone not loading milestone list

cc. @jschatz1 

See merge request !3346
 2016-03-22 19:30:59 +00:00
Douglas Barbosa Alexandre 8ca5b33175 Fix issues count on labels page 2016-03-22 15:29:57 -03:00
Alfredo Sumaran a42b2c388d Merge branch 'master' into issue_7959 2016-03-22 11:13:27 -05:00
Phil Hughes 33489f29f3 Fixes issue with assign milestone not loading milestone list 2016-03-22 16:00:47 +00:00
Phil Hughes 07da865113 Shows error messages when trying to create label in dropdown menu 
Closes #14495
 2016-03-22 14:56:00 +00:00
Phil Hughes b4f97b93a9 Fixes issue with signin button overflowing on mobile 
Closes #14477
 2016-03-22 13:56:07 +00:00
Zeger-Jan van de Weg 73a8088e2c User has to confirm deletion of issuables 2016-03-22 14:06:03 +01:00
Phil Hughes 57749022b6 Removed dropdown JS to align instead favours HTML class 2016-03-22 08:45:24 +00:00
Douwe Maan 31266c5be4 Address feedback 2016-03-22 00:09:20 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Felipe Artur 8d544645f0 Add specs and add visibility level to admin groups 2016-03-21 19:11:24 -03:00
Jacob Schatz 0305dd98b3 Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' 
change the css class has_tooltip to has-tooltip universally

closes #14432 

See merge request !3321
 2016-03-21 20:40:14 +00:00
Jacob Schatz 355d3119fd Merge branch 'ssh-page-ago' into 'master' 
Remove duplicated ago

Closes #14460 

See merge request !3332
 2016-03-21 19:50:14 +00:00
Jacob Schatz 16b44f7184 Merge branch 'project-icon' into 'master' 
Changing project icon

Closes #14196

See merge request !3268
 2016-03-21 19:33:57 +00:00
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Robert Schilling f9b942259c Remove duplicated ago 2016-03-21 19:11:32 +01:00
Zeger-Jan van de Weg 3b088fc5b5 Minor improvements on IssuableActions 2016-03-21 16:59:35 +01:00
Kamil Trzciński 3fca30d27f Merge branch 'feature/issue-move' into 'master' 
Ability to move issue to another project

Tasks:

- [x] Create scaffold of service that will move issue to another project.
- [x] Close old issue, add system note about moving issue to a new project.
- [x] Create a new issue, add system note about issue being moved from old project.
- [x] Check if issue can be moved to another project before executing service
- [x] Check permissions when moving an issue (`:admin_issue` ability)
- [x] Display select box for a new project when editing an issue
- [x] Show only projects that issue can be moved into in that select box
- [x] Add project select handler, helper and some permission filters to it
- [x] Preserve as much information as possible, including author
- [x] Prepare mechanisms that unfolds local references in issue description
- [x] Rewrite issue description with references unfolding and add some specs for it
- [x] Rewrite all system notes and comments attached to issue that is being moved
- [x] Update `Label` so that is was able to create cross reference labels (separate MR)
- [x] Add notifications about moving issue to another project
- [x] Display confirmation alert/message when issue move has been requested
- [x] Make it possible to undo selecting project where issue will be moved to
- [x] Add column to issue, that will indicate if it has been moved to another project
- [x] Do not allow to move issue that has been already moved
- [x] Write top-to-bottom feature spec in RSpec instead of Spinach

UI:

![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png)

![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png)

Closes #3024

See merge request !2831
 2016-03-21 14:01:19 +00:00
Phil Hughes 59e51e3cab Fixed bug where participants would not work correctly on merge requests 
Also fixed alignment bug with can't merge badge
 2016-03-21 11:31:50 +00:00