Commit Graph

26661 Commits

Author SHA1 Message Date
Yorick Peterse 31e28ebceb
Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
2016-04-13 17:24:21 +02:00
Dmitriy Zaporozhets ab4ea3720c Merge branch 'rs-archive-cache-worker-cron' into 'master'
Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105

See merge request !3663
2016-04-13 12:53:01 +00:00
Dmitriy Zaporozhets 87cd46c475 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-13 14:47:17 +02:00
Dmitriy Zaporozhets 59c735bd1e Merge branch 'rs-gitlab-com-check' into 'master'
Add `Gitlab.com?` method

To be used as a feature flag for GitLab.com-only features, such as
welcome emails.

We will be careful to only use this to disable features or functionality
that do not make sense for any installations that aren't GitLab.com. We
will not use this to restrict features from other installations or keep
them "exclusive" to GitLab.com.

See merge request !3682
2016-04-13 12:27:17 +00:00
Achilleas Pipinellis 941cfd1fbd Merge pull request #10136 from samjwlee/master
(doc) fix typo to ssh keys doc url
2016-04-13 14:52:03 +03:00
Rémy Coutable cf306b17bf Merge branch 'api-group-leaking' into 'master'
API: Return 404 if user does not have access to group

Closes #15185 

After !3587 is merged, I'll update this one to also fix the return code of the tests in !3587.

See merge request !3683
2016-04-13 11:32:25 +00:00
Rémy Coutable 861e685e18 Merge branch 'api-move-issues' into 'master'
API: Ability to move an issue

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

See merge request !3593
2016-04-13 10:55:12 +00:00
Robert Schilling 94c8fbc9fc Merge branch 'patch-2' into 'master'
improve formatting



See merge request !3688
2016-04-13 10:25:58 +00:00
Robert Schilling 4cd04443f5 Fix group_member_spec to not leak information 2016-04-13 12:10:12 +02:00
Robert Schilling fdbf368202 Fix doc for moving an issue 2016-04-13 12:03:05 +02:00
Rémy Coutable bbf49ffca1 Merge branch 'custom-transaction-tags' into 'master'
Added ability to add custom tags to transactions

cc @pcarranza 

See merge request !3674
2016-04-13 10:02:30 +00:00
Rémy Coutable e83424a13e Merge branch 'configure_trusted_proxies' into 'master'
Adjust the default trusted_proxies to only include localhost

And also allow other trusted proxies to be added from the config.yml.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538

Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208

See merge request !3524
2016-04-13 09:53:13 +00:00
Achilleas Pipinellis 5d14615a76 Merge branch 'jira_docs' into 'master'
Tie example config to JIRA screenshot

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

See merge request !3693
2016-04-13 09:32:52 +00:00
Robert Schilling 2b036025d6 Update tests for moving issues via API 2016-04-13 11:31:50 +02:00
Achilleas Pipinellis 244219376d Tie example config to JIRA screenshot
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
2016-04-13 12:28:07 +03:00
Robert Schilling 482f67edb4 API: Ability to move an issue 2016-04-13 11:23:42 +02:00
Yorick Peterse 3240ecfbef
Added ability to add custom tags to transactions
One use case for this is manually setting the "action" tag for Grape API
calls. Due to Grape running blocks there are no human readable method
names that can be used for the "action" tag, thus we have to set these
manually on a case by case basis.
2016-04-13 11:22:37 +02:00
Robert Schilling ca40479c51 API: Avoid group leak while updating the group 2016-04-13 11:20:45 +02:00
Robert Schilling b2f48d8c46 API: Return 404 if user does not have access to group 2016-04-13 11:11:09 +02:00
Rémy Coutable 8ea6c6d80c Merge branch 'issue_15044' into 'master'
Allow to close invalid merge request

fixes #15044

See merge request !3664
2016-04-13 09:10:57 +00:00
Achilleas Pipinellis 6bb71869b8 Merge branch 'docs-new-branch-button-3886' into 'master'
Docs for the new branch button

[ci-skip]

Closes #3886 

@axil Could you check this and make sure this is up to your standards?



See merge request !3425
2016-04-13 09:02:14 +00:00
Yorick Peterse 57e660d8f3 Merge branch 'fix-stale-branch-count-cache' into 'master'
Fix repository cache invalidation issue when project is recreated with an empty repo

See merge request !3692
2016-04-13 08:37:51 +00:00
Achilleas Pipinellis 4a09a6c6f2 Move 'New branch from issue' feature doc to web_editor.md
[ci skip]
2016-04-13 11:31:06 +03:00
Rémy Coutable fc9e1be1fd Merge branch 'api-group-visibility' into 'master'
API: Ability to update a group

This makes it much easier to update a group after introducing the group visibility.

* Closes #14991 

See merge request !3587
2016-04-13 08:23:29 +00:00
Stan Hu 2ce7559d70 Fix repository cache invalidation issue when project is recreated with an empty repo
To reproduce:

1. Create a project with some content
2. Rename the project
3. Create a new project with the same name.
4. Boom - 404.

After step 2, the branch and tag counts were not being cleared. This would
cause `repository.has_visible_content?` to erroneously return `true`
for the newly-created project.

Closes #13384
2016-04-13 00:04:17 -07:00
Ben Bodenmiller a0008f2720 improve formatting 2016-04-12 23:57:42 +00:00
Jacob Schatz 64d71b4dfc Merge branch 'notes-input' into 'master'
Wrap text in notes box if longer than code in diff

* Fixes branch name overflow
* Text and inline `code` wraps in comments
* `code` blocks scroll horizontally

![Screen_Shot_2016-04-11_at_4.59.15_PM](/uploads/39eee7d35ea79d1a3944aa6281b72121/Screen_Shot_2016-04-11_at_4.59.15_PM.png)

See merge request !3626
2016-04-12 22:08:42 +00:00
Robert Speicher abfa6dcc43 Merge branch 'fix-todo-target-path' into 'master'
Fix todo_target_path for todos where target was removed

Fixes #15187 

See merge request !3684
2016-04-12 22:00:43 +00:00
Robert Speicher 2e13f6c326 Add `Gitlab.com?` method
To be used as a feature flag for GitLab.com-only features, such as
welcome emails.

We will be careful to only use this to disable features or functionality
that do not make sense for any installations that aren't GitLab.com. We
will not use this to restrict features from other installations or keep
them "exclusive" to GitLab.com.
2016-04-12 17:30:11 -04:00
Lee fd248b0f06 (doc) fix typo to ssh keys doc url 2016-04-12 16:13:31 -05:00
Douglas Barbosa Alexandre 6a238c37e0 Fix todo_target_path for todos where target was removed 2016-04-12 18:06:52 -03:00
Annabel Dunstone 60736db429 Remove max-width from comments 2016-04-12 16:04:33 -05:00
Annabel Dunstone d3ff7ca084 Input updates 2016-04-12 15:07:44 -05:00
Annabel Dunstone 447f3613b7 Wrap text in notes box if longer than code in diff 2016-04-12 15:07:44 -05:00
Robert Speicher 2505dc46e7 Merge branch 'rs-update-spring' into 'master'
Update spring and spring-commands-spinach

Spring changelog: https://git.io/vVAUY

See merge request !3681
2016-04-12 19:32:46 +00:00
Jacob Schatz 20418dc7da Merge branch 'issue_14206' into 'master'
Fix datetimes on tooltips

Closes #14206 

Updates tooltip datetimes on `.timeago()` instances. 

**Inline notes**

![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png)

**Existing and new notes**

![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png)


**Issuable dates**

![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png)

**Build dates**

![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png)

See merge request !3497
2016-04-12 19:28:55 +00:00
Felipe Artur a64f1c7636 Add changelog entry, improve specs and model code 2016-04-12 15:52:03 -03:00
Robert Speicher 42a391f744 Update spring and spring-commands-spinach
Spring changelog: https://git.io/vVAUY
2016-04-12 14:28:07 -04:00
Robert Speicher 66e6052b93 Merge branch 'check-import-job-status' into 'master'
Check and report import job status to help diagnose issues with forking

There are no functional changes, but adding checks/logs for Sidekiq job IDs to help track down why many users seem to get stuck fork/import jobs.

See merge request !3672
2016-04-12 18:07:33 +00:00
DJ Mountney e18f20d711 Updated trusted proxies doc section to link to the restart GitLab docs 2016-04-12 11:02:41 -07:00
Jacob Schatz 2c9894d457 Merge branch 'project-title-dropdown' into 'master'
Project dropdown in header uses new dropdown



See merge request !3339
2016-04-12 17:50:27 +00:00
DJ Mountney bb372ac97f Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting 2016-04-12 10:42:59 -07:00
DJ Mountney 38cff18af0 Adjust the default trusted_proxies to only include localhost, and allow other trusted proxies to be configured. 2016-04-12 10:42:59 -07:00
Robert Speicher 6f4b4fd901 Merge branch 'fix_emojis_not_showing_in_autocomplete' into 'master'
Fix emoji aliases not showing in autocomplete

closes #14948 

See merge request !3595
2016-04-12 17:38:21 +00:00
Jacob Schatz c52c192249 Merge branch 'member-access-note-row' into 'master'
Fixed issue with member access not being visible on notes

This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement

![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png)

Fixes #15049

See merge request !3618
2016-04-12 17:21:12 +00:00
Jacob Schatz e1838980c6 Merge branch 'fix_quick_submit_missing_in_edit_merge_request' into 'master'
Fix quick submit missing in edit merge request page

closes #14953 

![fix](/uploads/5b80b37330929514c81299b4c8fe3efb/fix.gif)

See merge request !3601
2016-04-12 17:15:52 +00:00
Jacob Schatz a5cb6b0b83 Merge branch 'admin-pages-layout-sass-update' into 'master'
Updated media query for admin/groups search box

@jschatz1 based on your comment https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3523#note_4632743

See merge request !3599
2016-04-12 17:13:47 +00:00
Jacob Schatz fa0de68cd8 Merge branch 'right-sidebar-link-hover' into 'master'
Fixed colour of dropdown link hover

![Screen_Shot_2016-04-07_at_16.02.40](/uploads/bfbfa5d1b82576b6bafaefd567effa06/Screen_Shot_2016-04-07_at_16.02.40.png)

See merge request !3596
2016-04-12 17:12:16 +00:00
Phil Hughes 1ac6bdb5c8 Updated CHANGELOG 2016-04-12 13:10:43 -04:00
Phil Hughes 63e54f1555 Updated based on Ruby feedback 2016-04-12 13:10:43 -04:00