home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,235 Commits 48 Branches 340 Tags
213974bc9bfca79136db32d47f4854b02e0e7fc2
Commit Graph
3311 Commits
Author SHA1 Message Date
Robert SpeicherandYorick Peterse 3b83ed2125 Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master' 
Prevent XSS via custom issue tracker URL

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

See merge request !1955
 2016-04-25 21:55:52 +00:00
Yorick Peterse a3783cde1a Merge branch 'fix-cache-invalidations' into 'master' 
Fix Error 500 due to stale cache when projects are renamed or transferred

See merge request !3865
 2016-04-25 21:54:09 +02:00
Rémy CoutableandYorick Peterse 8d7c63b708 Merge branch '15470-fix-unknown-license-not-shown' into 'master' 
Fix license detection to detect all license files, not only known licenses

Fixes #15470.

See merge request !3878
 2016-04-25 21:53:19 +02:00
Douwe MaanandYorick Peterse 059b6edaf8 Merge branch 'fix/label-filters' into 'master' 
Filter labels by including ALL filter titles

Fixed query to use `AND` and not `OR`. Refactored relevant specs

See merge request !3815
 2016-04-21 15:49:23 +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
Yorick Peterse c0acc32199 Merge branch 'fix-mr-cherry-pick-without-merge-commit' into 'master' 
Verify the MR being displayed question has a merge commit set and can be cherry-picked

See merge request !3830
 2016-04-21 09:41:16 +00:00
Rémy CoutableandYorick Peterse 223c64f8b5 Merge branch 'feature/incremental-build-trace-update' into 'master' 
Add incremental build trace update API

Closes #14537 

Must be merged if we want changes from gitlab-org/gitlab-ci-multi-runner!124 to work.

See merge request !3447
 2016-04-21 09:23:43 +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
Robert SpeicherandYorick Peterse 69821f1a01 Merge branch 'license-templates-and-api-12804' into 'master' 
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 2016-04-20 10:50:27 +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
Robert SpeicherandYorick Peterse e2903f28e5 Merge branch '15139-fix-constants-redefinition-warnings' into 'master' 
Define constants only if not defined yet and freeze them

Fixes #15139.

See merge request !3810
 2016-04-20 10:47:48 +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
Ben BodenmillerandYorick Peterse 8d1b82acf1 format merge request references properly 2016-04-19 19:18:56 +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
Gabriel MazettoandDmitriy Zaporozhets f6fa18668a moving overlapping scopes to webhook 2016-04-19 11:00:30 +02:00
Gabriel MazettoandDmitriy Zaporozhets ee1090e2b2 Added System Hooks for push and tag_push 
Code is based on Project Webhooks, removing deprecations and without
commits listing.
 2016-04-19 11:00:30 +02:00
Timothy Andrew f801e2243d A new branch created for a confidential issue is named <id>-confidential-issue. 2016-04-19 09:22:55 +05:30
Robert Speicher 387b025d15 Merge branch 'gh-keep-issues-prs-references' into 'master' 
Use GitHub Issue/PR number as iid to keep references

Closes #15294 

See merge request !3759
 2016-04-18 19:32:23 +00:00
Douglas Barbosa Alexandre d13bba44f0 Use GitHub Issue/PR number as iid to keep references 
With these changes we don’t lost the issue/pr references when importing
them to GitLab.
 2016-04-18 12:15:50 -03:00
Felipe Artur 820c08cefd Fix documentation and improve permissions code 2016-04-18 11:12:28 -03:00
Felipe Artur 09c8cf9de6 Remove group members check 2016-04-18 11:12:28 -03:00
Felipe Artur ce96d482d9 Insert users check into api 2016-04-18 11:12:27 -03:00
Felipe Artur 07b38c3b38 Code fixes 2016-04-18 11:12:27 -03:00
Felipe Artur 147879ae66 Fix specs 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
Grzegorz Bizon a6260b1eb7 Remove code that removes duplicate CI variables 
At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 3dec6e2629 Rename method that returns global envs in CI conf 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b7946b50fc Read job variables directly from gitlab CI config 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b578fbfb85 Make it possible to override build variables 2016-04-18 13:17:47 +02:00
Grzegorz Bizon a1363d39c6 Add variables keyword to job in CI config YAML 2016-04-18 13:17:47 +02:00
Yorick Peterse 651c3e841d Instrument Repository.clean_old_archives 2016-04-18 12:33:11 +02:00
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
Robert Speicher 2e4d9c1de6 Merge branch 'fix/project-import_url' into 'master' 
Fix for import_url fields on projects containing third-party credentials

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658 

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

See merge request !3066
 2016-04-15 21:52:00 +00:00
Robert Speicher 34b0561560 Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' 
Use rugged to change HEAD

_Originally opened at !2850 by @pmq20._

Needless to invoke gitlab_shell here, which is slow.

See merge request !3705
 2016-04-15 16:44:21 +00:00
Robert Schilling 3c704c33e0 Delete tags via rugged 2016-04-15 16:05:04 +02:00
James Lopez 05985b49a4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-15 08:49:08 +02:00
Douwe Maan 447a905088 Merge branch 'rs-trailing-slash-in-search' into 'master' 
Escape the query argument provided to `git grep` by `search_files`

Closes #14963.

See merge request !3633
 2016-04-15 06:46:47 +00: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 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
James Lopez e5f7a54530 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-14 18:12:10 +02: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
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
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
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02: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
Frank Groeneveld 2fd05aed46 Allow empty recipient list when pusher is added 
Closes #13574
 2016-04-14 10:24:09 +02: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