home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,795 Commits 48 Branches 340 Tags
720ef51bd97f478dba2d2c1b59df958dabd7500a
Commit Graph
2941 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
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
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
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
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 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
Douglas Barbosa Alexandre 8ca5b33175 Fix issues count on labels page 2016-03-22 15:29:57 -03: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
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
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Zeger-Jan van de Weg 3b088fc5b5 Minor improvements on IssuableActions 2016-03-21 16:59:35 +01:00
Rémy Coutable 17de30f412 Merge branch 'backport-ee-premailer' into 'master' 
Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318
 2016-03-21 10:46:37 +00:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Jacob Schatz a4422a3a2e Merge branch 'edit-form-alignment' into 'master' 
Fix spacing below edit note form

Also changed to allow the CSS to decide what should be hidden when editing

Thanks @JobV for having eagle eyes 😜 

See merge request !3306
 2016-03-20 15:54:49 +00:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Douwe Maan 01fe50a725 Merge branch 'fix-image-diff' into 'master' 
Fix bug where wrong commit ID was being used in a merge request diff to show old image

Closes #3769

Closes #14327

See merge request !3300
 2016-03-19 22:59:41 +00:00
Stan Hu 79ad6e0e38 Fix bug where wrong commit ID was being used in a merge request diff to show old image 
Closes #3769

Closes #14327
 2016-03-19 13:28:40 -07:00
Zeger-Jan van de Weg 7342a4566c Dry destroy action on issuables 2016-03-19 21:24:05 +01:00
Zeger-Jan van de Weg 67043ec53b Hide delete botton on edit page 2016-03-19 21:23:03 +01:00
Zeger-Jan van de Weg 212e83bab3 Soft delete issuables 2016-03-19 21:23:03 +01:00
Douwe Maan afbcdd8e7f Move diff line to separate partial 2016-03-19 20:04:23 +01:00
Rémy Coutable cafa408b25 Merge remote-tracking branch 'origin/master' into remove-wip 2016-03-18 23:29:18 +01:00
Rémy Coutable 0b942541da Improve the "easy WIP & un-WIP from link" feature 2016-03-18 23:27:35 +01:00
Alfredo Sumaran b3b219dae7 Display nav controls on mobile 2016-03-18 14:45:43 -05:00
Dmitriy Zaporozhets 5203a98411 Merge branch 'refactor-ui-lists' into 'master' 
Refactor colors and lists

* Introduce 2 color links: black and blue
* Use black color link for UI elements like lists
* Refactor lists to use .title nested under li
* Make all lists (events, todos, activity, projects etc) use style
* List colorschema is now 333 for links and 555 for text

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

cc @jschatz1 @skyruler 

See merge request !3307
 2016-03-18 18:35:19 +00:00
Dmitriy Zaporozhets daeed3fdf3 Refactor colors and lists 
* Introduce 2 color links: black and blue
* Use black color link for UI elements like lists
* Refactor lists to use .title nested under li
* Make all lists (events, todos, activity, projects etc) use style
* List colorschema is now 333 for links and 555 for text

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-18 19:02:08 +01:00
Phil Hughes 7dde8b2cf0 Fix spacing below edit note form 
Also changed to allow the CSS to decide what should be hidden when editting
 2016-03-18 17:23:54 +00:00
Arinde Eniola 5e39846e4b Add avatar to issue and MR pages header 2016-03-18 17:54:44 +01:00
Douwe Maan 9813eac56b Merge branch 'confidential-issues' into 'master' 
Add confidential issues

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
 2016-03-18 12:04:56 +00:00
Yorick Peterse 3f0d780c19 Show a notice for diffs that are too large 
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
 2016-03-18 12:30:46 +01:00
Douglas Barbosa Alexandre 7d403ec46f Add eye-slash icon to confidential issues 2016-03-17 20:56:00 -03:00
Douglas Barbosa Alexandre 482bfd1a6d Restrict access for confidential issues on milestone view 2016-03-17 20:55:59 -03:00
Jacob Schatz 09a32fa886 Merge branch 'fix_issue_mr_page_inconsistency' into 'master' 
Fix inconsistency in the header of issue and merge request pages

closes #13550 

# For Issue Page

### Before
![Screen_Shot_2016-03-17_at_8.46.59_PM](/uploads/ede7f2b98395362ae87e6258cc10520a/Screen_Shot_2016-03-17_at_8.46.59_PM.png)

### After
![Screen_Shot_2016-03-17_at_8.48.56_PM](/uploads/da7adf17cb397ddc0677a6a5e8033b8e/Screen_Shot_2016-03-17_at_8.48.56_PM.png)

# For Merge request Page

### Before
![Screen_Shot_2016-03-17_at_8.45.45_PM](/uploads/10137827c05c8166a0aa429687e50d1b/Screen_Shot_2016-03-17_at_8.45.45_PM.png)

### After
![Screen_Shot_2016-03-17_at_8.45.01_PM](/uploads/92151c03cfe29b71090a1e0ad31abd6e/Screen_Shot_2016-03-17_at_8.45.01_PM.png)


See merge request !3279
 2016-03-17 22:58:37 +00:00
Jacob Schatz 73ba88b539 Merge branch 'download-dropdown-alignment' into 'master' 
Fixed alignment of download dropdown

With the new dropdown CSS - some dropdowns might look a bit odd

## Previously

![Screen_Shot_2016-03-16_at_11.46.04](/uploads/c1a8fc95ed4410de35d7bd5caedf28f5/Screen_Shot_2016-03-16_at_11.46.04.png)

## Now

![Screen_Shot_2016-03-16_at_11.45.26](/uploads/998637fe0872b2e826a8c17d183499dc/Screen_Shot_2016-03-16_at_11.45.26.png)

See merge request !3245
 2016-03-17 21:47:03 +00:00
Arinde Eniola 613e0bc541 Fix inconsistency in the header of issue and merge request pages 2016-03-17 22:34:42 +01:00
Robert Speicher dc396d0fa4 Merge branch 'edited-text' into 'master' 
Edited timeago text on comments

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538 

See merge request !3063
 2016-03-17 20:35:06 +00:00
Robert Speicher 1525885648 Merge branch 'hide-builds-feature' into 'master' 
Hide builds from Project's settings when the feature is disabled

Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944

See merge request !3220
 2016-03-17 19:49:48 +00:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Felipe Artur ec20fdf366 Code improvements and add Create group service 2016-03-16 19:44:33 -03:00
Phil Hughes d94dc565ba Fixed alignment of download dropdown 
With the new dropdown CSS - some dropdowns might look a bit odd
 2016-03-16 11:44:53 +00:00
Zeger-Jan van de Weg 2b97c92119 Incorporate review 2016-03-15 20:21:11 +01:00
Zeger-Jan van de WegandZeger-Jan van de Weg ad97bebfed Enhance new branch button on an issue 2016-03-15 20:21:11 +01:00