28351806aa
Give merge request widget the vars it desires
2015-12-09 09:59:30 +01:00
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
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
6213263d32
Merge branch 'mr-builds' into 'master'
...
Add Builds tab to MR detail page
## Before
## After
Fixes #3907
See merge request !2016
2015-12-09 00:05:23 +00:00
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
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
57d71520bd
Make tooltip less confusing
2015-12-08 22:30:40 +01:00
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
54d0ff982b
Merge branch 'build-related-fixes' into 'master'
...
Build related UI fixes
## Before
## After
See merge request !2015
2015-12-08 17:06:11 +00:00
befff32ecb
Merge branch 'languages-graph' into 'master'
...
Languages graph
See merge request !2009
2015-12-08 16:56:39 +00:00
df6750d3d6
Default target branch to patch-n when editing file in protected branch
2015-12-08 16:42:10 +01:00
f39ff54290
Merge branch 'master' into zj/gitlab-ce-merge-if-green
2015-12-08 16:18:18 +01:00
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
75486f09c4
Merge branch 'master' into zj/gitlab-ce-merge-if-green
2015-12-08 13:43:45 +01:00
1567572e79
Add Builds tab to MR detail page
2015-12-08 13:11:41 +01:00
a17ba43bfd
Move commit builds to partial
2015-12-08 13:10:33 +01:00
9907a7e6ed
Get ci_commit in MR controller
2015-12-08 13:06:55 +01:00
86a09cfaf1
`builds_enabled` rather than `ci_enabled`
2015-12-08 13:06:53 +01:00
9b561e7e15
Implement languages graph page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-08 02:35:34 +01:00
949a7e8e20
Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ce
2015-12-07 20:17:29 +01:00
e53b350cb6
Add specs for showing lfs object in UI.
2015-12-07 15:03:50 +01:00
359d94607c
Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
...
Fix problems with award-emoji-only comment
This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.
Closes #3734
cc @vsizov
See merge request !1936
2015-12-07 12:26:56 +00:00
0e96d6eb10
Merge branch 'master' into merge-if-green
2015-12-07 10:06:07 +01:00
a120b78940
Handle and report SSL errors in Web hook test. Check for status 200 for success.
...
If a Web hook test fails due to an SSL error or some other error, report
the result back to the user instead of an Error 500.
Closes #3656
Handle response
2015-12-04 07:13:28 -08:00
a89d6d1428
Add authorization to new branch/tag pages.
2015-12-03 18:53:17 +01:00
ea52a81da4
Move the file serving to Raw controller, add a few ifs to view.
2015-12-03 17:08:09 +01:00
0a081e7eff
If a user clicks on the LFS object, it should be served if the user has access to the object.
2015-12-03 14:59:10 +01:00
a527f5c27f
Notify user when award-emoji comment is invalid
2015-12-03 13:38:59 +01:00
bfce5d7168
Render json message with errors if note didn't pass validation
2015-12-03 13:38:59 +01:00
8c4a3c77d8
Add ignore whitespace change option to commit view
2015-12-01 09:51:10 +09:00
b9df1a6355
Strip attributes for Milestone and Issuable. #3428
2015-11-26 10:16:50 -05:00
8608c6325e
Refactor MergeWhenBuildSucceedsService and incorporate feedback
2015-11-23 10:11:54 +01:00
3fc10d46f1
Emoji bug: Invalid url to image
2015-11-22 01:51:00 +02:00
fbac9e106d
Award: merge request fix
2015-11-21 19:17:06 +02:00
f31ee52507
Fix for Emoji
2015-11-20 11:13:43 +02:00
68d4ab2381
Merge branch 'emoji_votes' into 'master'
...
Award Emoji
This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.
For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍 " and any other. You can post not only emoji that listed in the emoji picker.
See merge request !1825
2015-11-19 21:34:38 +00:00
3a85c93a7a
Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'
...
Add option to create merge request when editing/creating a file
Replaces !1611
Fixes #3059
See merge request !1820
2015-11-19 16:45:45 +00:00
bdf4007cb7
adressing comments
2015-11-19 18:12:17 +02:00
a2912074be
satisfy rubocop
2015-11-19 01:31:15 +02:00
23df515fd0
Emoji: fix image of emoji when it is submitted via comment
2015-11-19 01:26:00 +02:00
2f6f99d300
award for merge requests[ci skip]
2015-11-19 01:25:59 +02:00
fd2c0fe446
award emoji
2015-11-19 01:25:27 +02:00
f3cfd20952
DRY up code
2015-11-18 17:17:38 +01:00
7b405d3064
Fix redirect after import fails.
2015-11-18 12:00:57 +01:00
53b285c9a8
Merge branch 'master' into merge-if-green
2015-11-18 11:58:01 +01:00
2f048df4a4
API support, incorporated feedback
2015-11-18 11:17:41 +01:00
e86d53b27f
Merge branch 'master' into dirceu/gitlab-ce-new-merge-request-from-file-edit
2015-11-18 11:17:20 +01:00
df6bb57921
Merge branch 'compare-first-commit' into 'master'
...
Correctly set comparison first commit when range includes a merge commit
Fixes #3207 .
See merge request !1814
2015-11-17 18:51:40 +00:00
d431f3ec40
Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master'
...
Prevent the last owner of a group from being able to delete themselves
by 'adding' themselves as a master
Replaces !1708 .
Fixes #1111 .
See merge request !1815
2015-11-17 18:23:27 +00:00
e945ec0280
Add "Start a new merge request" option to every commit form
2015-11-17 18:53:56 +01:00
Douwe Maan
Dmitriy Zaporozhets
Robert Speicher
Marin Jankovski
Grzegorz Bizon
Zeger-Jan van de Weg
Stan Hu
Grzegorz Bizon
Minsik Yoon
Jose Corcuera
Valery Sizov
Valery Sizov