home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,323 Commits 48 Branches 340 Tags
7e8dc22dd7fb730d3fc47150cdfe95dc9ffdbc3a
Commit Graph
10666 Commits
Author SHA1 Message Date
Douwe Maan 28351806aa Give merge request widget the vars it desires 2015-12-09 09:59:30 +01:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
 2015-12-09 09:00:25 +01:00
Stan Hu 9dbc768db8 Update annotations 2015-12-08 21:00:01 -08:00
Dmitriy Zaporozhets 9dd2674963 Fix only 20 group members showing on project member page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 01:43:57 +01:00
Dmitriy Zaporozhets 6213263d32 Merge branch 'mr-builds' into 'master' 
Add Builds tab to MR detail page

## Before

![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)

## After

![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)

Fixes #3907

See merge request !2016
 2015-12-09 00:05:23 +00:00
Zeger-Jan van de WegandStan Hu 56f25c3e61 Improve text indication visibility on snippets 2015-12-08 14:31:24 -08:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master' 
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
 2015-12-08 22:04:52 +00:00
Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
 2015-12-08 22:34:03 +01:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
 2015-12-08 22:26:29 +01:00
Robert Speicher e616739e2f Merge branch 'rs-clipboard-selector' into 'master' 
Make cross-project reference's clipboard target less naive

See !2023

See merge request !2024
 2015-12-08 21:22:17 +00:00
Robert Speicher 813c9b2aeb Make cross-project reference's clipboard target less naive 
See !2023
 2015-12-08 15:29:46 -05:00
Robert Speicher ebee5077f2 Make tab target selectors less naive 
Prior, any of the specified IDs could have been hijacked by a table of
contents header, breaking the tab functionality. For example, a `##
Notes` header would get the id `notes` and prevent the Discussion tab
from being activated.

Closes #3908
 2015-12-08 14:47:28 -05:00
Dmitriy Zaporozhets e99ca657e5 Merge branch 'ui-framework-fixes' 2015-12-08 18:57:43 +01:00
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 18:50:02 +01:00
Dmitriy Zaporozhets 54d0ff982b Merge branch 'build-related-fixes' into 'master' 
Build related UI fixes

## Before

![Screen_Shot_2015-12-08_at_13.15.21](/uploads/b72ed55da1f0ec953d2eb077fa4fbb18/Screen_Shot_2015-12-08_at_13.15.21.png)

## After

![Screen_Shot_2015-12-08_at_13.15.01](/uploads/144d8099e2724a51125e392dcbd43ed4/Screen_Shot_2015-12-08_at_13.15.01.png)


See merge request !2015
 2015-12-08 17:06:11 +00:00
Dmitriy Zaporozhets 98368d6ec8 Merge branch 'fix-broken-group-avatar-upload' into 'master' 
Fix broken group avatar upload

Closes #3918

See merge request !2018
 2015-12-08 17:02:50 +00:00
Robert Speicher befff32ecb Merge branch 'languages-graph' into 'master' 
Languages graph

See merge request !2009
 2015-12-08 16:56:39 +00:00
Douwe Maan 7aeb7077cb Only show Edit button for text blobs. 2015-12-08 17:11:23 +01:00
Douwe Maan 82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Stan Hu 3d654cc0fa Fix broken group avatar upload 
Closes #3918
 2015-12-08 07:52:08 -08:00
Douwe Maan df6750d3d6 Default target branch to patch-n when editing file in protected branch 2015-12-08 16:42:10 +01:00
Douwe Maan f39ff54290 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 16:18:18 +01:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master' 
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
 2015-12-08 14:19:52 +00:00
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01:00
Douwe Maan c767d0e6bd Change text of MR widget heading 2015-12-08 13:22:17 +01:00
Douwe Maan 14969ac87f Add '#' to build page title 2015-12-08 13:17:05 +01:00
Douwe Maan 1567572e79 Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
Douwe Maan a17ba43bfd Move commit builds to partial 2015-12-08 13:10:33 +01:00
Douwe Maan 9907a7e6ed Get ci_commit in MR controller 2015-12-08 13:06:55 +01:00
Douwe Maan 35fd7112bf Link builds list status to build details 2015-12-08 13:06:55 +01:00
Douwe Maan 526e64e0c4 Show "#123" instead of "Builds #123" to make column smaller 2015-12-08 13:06:54 +01:00
Douwe Maan b53769aedc Change "Cancel all" to "Cancel running" 2015-12-08 13:06:54 +01:00
Douwe Maan 1b5302f8e7 Reduce MR/issue duplication 2015-12-08 13:06:54 +01:00
Douwe Maan 90a4653593 Remove top border from build page 2015-12-08 13:06:54 +01:00
Douwe Maan 3f1e72a0cc Memoize ci_yaml_file. 2015-12-08 13:06:54 +01:00
Douwe Maan f523c3c685 Use gray content block for network graph header 2015-12-08 13:06:54 +01:00
Douwe Maan f8fdec687f Fix padding around protected branches well 2015-12-08 13:06:53 +01:00
Douwe Maan 53a6f0b194 Fix profile private token form actions 2015-12-08 13:06:53 +01:00
Douwe Maan 86a09cfaf1 builds_enabled rather than ci_enabled 2015-12-08 13:06:53 +01:00
Douwe Maan 3eb209123d Render monospace text at 90% of the parent font-size 2015-12-08 13:06:53 +01:00
Douwe Maan badeb82f63 Use consistent padding for .gitlab-ci.yml info callouts 2015-12-08 13:06:53 +01:00
Douwe Maan 507fdb4b2b Use consistent padding in panel heading 2015-12-08 13:06:52 +01:00
Douwe Maan c64a881a40 Allow center top menu to span multiple lines 2015-12-08 13:06:52 +01:00
Douwe Maan 3c80a54315 Merge branch 'master' into ui/misc 2015-12-08 12:50:25 +01:00
Douwe Maan f5430e48b4 Merge branch 'rs-validators' into 'master' 
Add more custom validators

These custom validators allow us to DRY up our models a bit.

See merge request !1944
 2015-12-08 08:42:17 +00:00
Dmitriy Zaporozhets 9b561e7e15 Implement languages graph page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 02:35:34 +01:00
Douglas Barbosa Alexandre f7aafd8fc8 Merge branch 'master' into fix-merge-request-that-removes-submodule 2015-12-07 22:41:18 -02:00