Commit Graph
2916 Commits
Author SHA1 Message Date
Robert SpeicherandYorick Peterse aa664af3dd Merge branch '15527-fix-wiki-page-creation-issue' into 'master'
Fix error when trying to create a wiki page

Closes #15527, #15569, #15623, #15630, #15637, #15653, #15870, #16558, #16875, #16987, #17016, https://github.com/gitlabhq/gitlabhq/issues/10317.

See merge request !3924
2016-05-03 09:42:16 +00:00
Robert Speicher 6f0cadca87 Merge remote-tracking branch 'dev/8-7-stable' into 8-7-stable 2016-05-02 20:00:11 -04:00
Jacob SchatzandYorick Peterse ea066cc1bf Merge branch 'async-new-branch-button' into 'master'
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
2016-04-29 00:33:45 +02:00
Robert SpeicherandYorick Peterse 61013f11bb Merge branch 'fix-impersonation-issue' into 'master'
Prevent privilege escalation via "impersonate" feature

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

See merge request !1956
2016-04-25 21:52:40 +00:00
Dmitriy ZaporozhetsandYorick Peterse 44a18c64e3 Merge branch 'fix-issue-with-assignee-not-updating' into 'master'
Fixed issue with assignee object not being returned

Closes #15515

See merge request !3877
2016-04-25 21:54:55 +02:00
Rémy CoutableandYorick Peterse 76c215cbd0 Merge branch 'issue_3799' into 'master'
Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
2016-04-22 10:59:09 +02:00
Robert SpeicherandYorick Peterse 8bfaa1ebda Merge branch 'label-text-color-sidebar' into 'master'
Fixes text color on labels in sidebar

Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.

With this, the text color comes from the JSON.

See merge request !3846
2016-04-22 10:56:32 +02:00
Rémy CoutableandYorick Peterse 778b1f46b4 Merge branch 'rs-diff_view' into 'master'
Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732
2016-04-22 10:56:04 +02:00
Robert SpeicherandYorick Peterse dd5a29e8da Merge branch 'confirmation-screen' into 'master'
Improved email confirmation UX

Closes #4228

See merge request !3184
2016-04-22 10:55:48 +02:00
Yorick Peterse a12496ccfd Merge branch 'remove-update-files' into 'master'
Removed JS update templates

See merge request !3814
2016-04-21 22:25:50 +00:00
Rémy CoutableandYorick Peterse fee23a52ff Merge branch 'issue_5838' into 'master'
Show project members only for members

fixes #5838 

See merge request !3752
2016-04-21 15:49:02 +00:00
Robert SpeicherandYorick Peterse 82d8c74f76 Merge branch 'due-date-frontend' into 'master'
Add due date to issues

Closes: #12709

See merge request !3614
2016-04-21 10:07:02 +00:00
Jacob SchatzandYorick Peterse 54851c014a Merge branch 'multi-filter-labels' into 'master'
Mutliple label filter

Fixes #989 

See merge request !3438
2016-04-21 09:23:28 +00:00
Rémy CoutableandYorick Peterse aa49124ef4 Merge branch 'feature/raw-trace-output' into 'master'
Add raw build trace output

Closes #15308, #15147

Changes in the UI:

- on finished build:

    ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png)

- on running build:

    ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png)

See merge request !3767
2016-04-20 10:49:56 +02:00
Rémy CoutableandYorick Peterse b255cbf396 Merge branch 'slack_wiki_notifications' into 'master'
add slack notifications for wiki pages

## What does this MR do?

Lets the Slack service be configured to send notifications when wiki pages are created or edited.

## Are there points in the code the reviewer needs to double check?

I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)

## Why was this MR needed?

Related to #563 and fixes #4233.



See merge request !2998
2016-04-20 10:49:31 +02:00
P.S.V.RandYorick Peterse fd4c833367 Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-19 19:19:00 +02:00
Robert Speicher 18a8844fa0 Merge branch '14566-confidential-issue-branches' into 'master'
Sanitize branch names for confidential issues

- When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`.
- The behaviour for non-confidential issues stays the same.

Closes #14566

See merge request !3671
2016-04-19 16:15:50 +00:00
Yorick Peterse 229f3ce9ce Configuring of points per UDP packet
This allows users to configure the number of points stored in a single
UDP packet. This in turn can be used to reduce the number of UDP packets
being sent at the cost of these packets being somewhat larger.

The default setting is 1 point per packet so nothing changes for
existing users.
2016-04-19 14:35:25 +02:00
Kamil Trzciński ee812a8707 Merge branch 'configurable-shared-runners-text' into 'master'
Add configurable shared runners text

cc @axil @rspeicher @grzesiek 

See merge request !3750
2016-04-19 12:15:59 +00:00
Douwe Maan 1532d202f1 Merge branch 'fix/link-group-permissions' into 'master'
Check permissions when sharing project with group

## Summary

Unprivileged user was able to share project with group he didn't have access to, and therefore gain partial access to that group, which opened possibilities for further actions like listing private projects in that group.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/15330

## Fix

This change introduces additional check for group read access.

## Further work

We can think about preventing such problems in the future (this is quite common problem) by moving permissions checks to another layer of abstraction (TBD).

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

See merge request !1949
2016-04-19 11:36:57 +00:00
Grzegorz Bizon 66b6d82a3e Use guard clause to check ability to share project 2016-04-19 12:15:56 +02:00
Grzegorz Bizon d177abb32b Refactor method that shares project with a group 2016-04-19 12:15:56 +02:00
Grzegorz Bizon f2e3868124 Check permissions when sharing project with group
Closes #15330
2016-04-19 12:15:56 +02:00
Dmitriy Zaporozhets 45525edd5b Add push events to permit params in system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19 11:42:39 +02:00
Felipe Artur 09c8cf9de6 Remove group members check 2016-04-18 11:12:28 -03:00
Felipe Artur 07b38c3b38 Code fixes 2016-04-18 11:12:27 -03:00
Felipe Artur e8a77c0aee Fix code 2016-04-18 11:12:27 -03:00
Felipe Artur 668d6ffa43 Add specs and fix code 2016-04-18 11:12:27 -03:00
Felipe Artur 57519565f1 Move verification to abilities 2016-04-18 11:12:27 -03:00
Felipe Artur b05f0a4858 Restrict user profiles based on restricted visibility levels 2016-04-18 11:11:36 -03:00
Kamil Trzcinski 6b124d42d9 Add configurable shared runners text 2016-04-18 09:54:52 -04:00
Timothy Andrew aa396ae5ee Remove unused variable in IssuesController. 2016-04-18 13:01:23 +05:30
Jacob Schatz e79b0dd762 Simplify random user generation. 2016-04-16 16:00:30 -04:00
Jacob Schatz ffd2416c56 Make a user available for the user variable 2016-04-16 09:28:04 -04:00
Jacob Schatz bb59a1f98e Merge branch 'assign-to-issuable-opener' into 'master'
Issuable can be assigned to author

Closes #9014

The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.

/cc @DouweM

See merge request !2765
2016-04-15 15:43:26 +00:00
Zeger-Jan van de Weg 33f8b06c39 Merge branch 'master' into assign-to-issuable-opener 2016-04-15 14:38:15 +02:00
Rémy Coutable ddec8e777f Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'
Make /profile/keys/new redirects to /profile/keys for back-compat

This addresses https://github.com/gitlabhq/gitlabhq/issues/10138.

See merge request !3717
2016-04-15 08:19:01 +00:00
Rémy Coutable a434ffd3b3 Make /profile/keys/new redirects to /profile/keys for back-compat
Report: https://github.com/gitlabhq/gitlabhq/issues/10138

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-15 09:45:58 +02:00
Timothy Andrew 953bafff90 Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches 2016-04-15 09:50:53 +05:30
Robert Speicher f583129767 Add Sentry program context even without a current user 2016-04-14 13:56:30 -04: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
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
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
Jacob Vosmaer f07316f27c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-13 17:38:59 +02:00
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
Jacob Vosmaer 0f602be99f Clear repository check columns asynchronously 2016-04-13 15:56:05 +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
Timothy Andrew c4393a10d7 Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches 2016-04-13 09:20:25 +05:30