Timothy Andrew
f801e2243d
A new branch created for a confidential issue is named <id>-confidential-issue.
2016-04-19 09:22:55 +05:30
Timothy Andrew
aa396ae5ee
Remove unused variable in IssuesController.
2016-04-18 13:01:23 +05:30
Timothy Andrew
953bafff90
Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches
2016-04-15 09:50:53 +05:30
Jacob Schatz
ba18e0b208
Merge branch '14176-diff-paste-data' into 'master'
...
Copying and pasting doesn't grab line numbers or +/-
Fixes #14176
See merge request !3687
2016-04-14 21:01:08 +00:00
Stan Hu
95ce4d29c3
Merge branch 'rs-sentry-contexts' into 'master'
...
Add Sentry program context even without a current user
See merge request !3729
2016-04-14 20:18:01 +00:00
Jacob Schatz
9cd5e0fc48
Merge branch 'subscribe-button-fix' into 'master'
...
Removed references to subscribe-button CSS class
These were being blocked by adblocks
Closes #15043
See merge request !3677
2016-04-14 18:11:18 +00:00
Robert Speicher
f583129767
Add Sentry program context even without a current user
2016-04-14 13:56:30 -04:00
Annabel Dunstone
80d8f8b876
Syntax & style updates
2016-04-14 12:33:29 -05:00
Robert Speicher
95a867e0af
Merge branch 'auto-fsck' into 'master'
...
Auto git fsck
Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232
See merge request !3232
2016-04-14 17:15:58 +00:00
Robert Speicher
58ca84908c
Merge branch 'fix-group-projects-sort' into 'master'
...
Projects on group page should be sorted by last activity instead of id/created_at
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Fixes #15237
See merge request !3716
2016-04-14 17:15:17 +00:00
Robert Speicher
7ef35b9c61
Shut up, Rubocop
2016-04-14 12:28:48 -04:00
Rémy Coutable
dd9ced0af9
Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master'
...
Fix revoking of authorized OAuth applications
Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.
Added a spec and also found that the `gon` variables were not being set for this view.
Closes #14370
See merge request !3690
2016-04-14 15:26:09 +00:00
Rémy Coutable
4a514b27e9
Merge branch 'issue_15155' into 'master'
...
Setup visibility level for project when transfering for a group
fixes #15155
See merge request !3707
2016-04-14 15:13:08 +00:00
Jacob Vosmaer
91cebb7289
Documentation / help improvements
2016-04-14 17:04:18 +02:00
Felipe Artur
a8ea2c1895
Change transfer service to use existing methods
2016-04-14 11:34:42 -03:00
Stan Hu
e450892f56
Include GonHelper separately and remove created_at in factory
2016-04-14 07:25:27 -07:00
Stan Hu
c7e384aab2
Add spec for deletion of authorized OAuth2 application
...
Closes #14370
Move gon function into its own helper
2016-04-14 07:24:58 -07:00
connorshea and Stan Hu
0c082d5e3a
Fix the improper delete form being rendered for an oauth_authorized_application
...
This fixes the authorized applications not being revoked properly at
`/profile/applications`.
Fixes #14370 .
2016-04-14 07:24:57 -07:00
Annabel Dunstone
82d0221b63
Add line type conditional to diff line helper
2016-04-14 09:10:40 -05:00
Annabel Dunstone
d176f873e1
Add content attributes to discussion diffs; change styling of add-note icon to prevent white spaces in paste
2016-04-14 09:10:40 -05:00
Annabel Dunstone
7030ffb0e0
Copying and pasting doesn't grab line numbers or +/-
2016-04-14 09:10:40 -05:00
Rémy Coutable
64776ab2b4
Merge branch 'start-with-iid-on-new-branch' into 'master'
...
Start with iid on branch creation
After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.
See merge request !3708
2016-04-14 13:41:30 +00:00
Phil Hughes
a2931a392a
Fixed style issues
2016-04-14 14:06:33 +01:00
Zeger-Jan van de Weg
0385cd5a58
Start with iid on branch creation
2016-04-14 14:49:45 +02:00
Phil Hughes
fd9c3b7c74
Fixed issue with other links being clicked in diffs
2016-04-14 11:29:19 +01:00
Phil Hughes
f3ed4763f5
Correctly scrolls to the line when clicking
2016-04-14 11:29:19 +01:00
Phil Hughes
8a8d4c9bf2
Diff viewer links to correct part of the file
...
Added highlight colours to diff rows
Closes #13852
2016-04-14 11:29:19 +01:00
Rémy Coutable
c71cdb194f
Merge branch 'simplify-gitlab-url_builder-15202' into 'master'
...
Refactor and expose only Gitlab::UrlBuilder.build(record)
```
$ git grep Gitlab::UrlBuilder
app/models/commit.rb: url: Gitlab::UrlBuilder.build(self),
app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue)
app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note)
lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note)
spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note))
spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do
```
Fixes #15202 .
See merge request !3696
2016-04-14 10:27:49 +00:00
Phil Hughes
0d8462b897
Fixed scss syntax issue
2016-04-14 10:28:05 +01:00
Phil Hughes
ca01103ded
Focus variable for dropzone
2016-04-14 10:28:05 +01:00
Phil Hughes
8ffb02d9f8
Added CHANGELOG item
2016-04-14 10:28:05 +01:00
Phil Hughes
c5d7b467ab
Updated dropzone hover styling
2016-04-14 10:28:05 +01:00
Phil Hughes
094cafcaa7
Removed GL Actions class
2016-04-14 10:28:05 +01:00
Phil Hughes
7a1800fec8
Fixed group milestones placeholder bug
2016-04-14 10:28:05 +01:00
Phil Hughes
6e93bd56f0
Placeholder on milestone form
...
Updated JS spec to include gl_form
2016-04-14 10:28:05 +01:00
Phil Hughes
3de09d1475
Updated all GFM forms to use new GLForm class
2016-04-14 10:28:05 +01:00
Phil Hughes
d67c3e35c9
Milestones use new GLForm class
2016-04-14 10:28:05 +01:00
Phil Hughes
c45ca936c7
merge request form uses new GLForm
2016-04-14 10:28:05 +01:00
Phil Hughes
ff7fb09ea8
Updated issue form to use new GLForm
2016-04-14 10:28:05 +01:00
Phil Hughes
5dd01f572c
Destroy discussion form
2016-04-14 10:28:05 +01:00
Phil Hughes
82164a9f77
Notes form JS update
...
Updated the JS to have a standard class with standard actions for each form
Created ability to have toolbar buttons that insert different prefixes dependant upon the data-prefix attribute
2016-04-14 10:28:05 +01:00
Dmitriy Zaporozhets
ec3f4f5bf0
Projects on group page should be sorted by last activity instead of id/created_at
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2016-04-14 11:00:24 +02:00
Frank Groeneveld
2fd05aed46
Allow empty recipient list when pusher is added
...
Closes #13574
2016-04-14 10:24:09 +02:00
Phil Hughes
f5e8667fc5
Fixed haml style issues
2016-04-14 09:13:32 +01:00
Felipe Artur
11f46b459e
Setup visibility level for project when transfering for a group
2016-04-13 15:28:10 -03:00
Jacob Schatz
31d9f65553
Merge branch 'issue_14771' into 'master'
...
Hide top search form on the search page
Closes #14771
See merge request !3668
2016-04-13 17:28:14 +00:00
Jacob Schatz
d7c7f54634
Merge branch 'issue_15093' into 'master'
...
Set tooltips for new added labels
Fixes #15093
See merge request !3667
2016-04-13 17:19:20 +00:00
Jacob Schatz
9c9893dd6d
Merge branch '14762-delete-button' into 'master'
...
Update delete button
Closes #14762
See merge request !3665
2016-04-13 17:16:30 +00:00
Jacob Schatz
e17f79fdfa
Merge branch 'issuable-form-alignment' into 'master'
...
Fixed alignment on issuable new form
Fixes #13802
See merge request !3661
2016-04-13 16:24:48 +00:00
Robert Speicher
0b447a9977
Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master'
...
Fix a bug with trailing slash in bamboo_url
Also, improve specs for BambooService
Similar to !3679 .
See merge request !3680
2016-04-13 16:18:46 +00:00
Timothy Andrew
Jacob Schatz
Stan Hu
Robert Speicher
Annabel Dunstone
Robert Speicher
Rémy Coutable
Jacob Vosmaer
Felipe Artur
connorsheaandStan Hu
Phil Hughes
Zeger-Jan van de Weg
Dmitriy Zaporozhets
Frank Groeneveld