home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,815 Commits 48 Branches 340 Tags
1e495e7633ee8fa3acee68f4e389129a294efd91
Commit Graph
21815 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert SpeicherandRémy Coutable 1e495e7633 Merge branch 'fix-private-snippet-api' into 'master' 
Prevent information disclosure via snippet API

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

See merge request !1958

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-26 11:23:34 +02:00
Rémy CoutableandRémy Coutable 554567331c Merge branch 'fix-project-hook-delete-permissions' into 'master' 
Prevent users from deleting Webhooks via API they do not own

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

See merge request !1959

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-26 10:51:27 +02:00
Robert SpeicherandRémy Coutable 9bff2eee51 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

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-26 10:50:04 +02:00
Robert Speicher 84a99f7b47 Update .gitlab-ci.yml 2016-04-25 21:29:15 -04:00
Robert SpeicherandRobert Speicher 806cc20803 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 16:58:52 -04:00
Robert SpeicherandRobert Speicher 6233e8be5c Merge branch 'dev_issue_15331' into 'master' 
Fixes window.opener bug

Adds `noreferrer` value to rel attribute for external links

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331

See merge request !1953
 2016-04-25 15:50:38 -04:00
Robert Speicher 4c83880182 Version 8.3.8 v8.3.8 2016-04-20 16:17:26 -04:00
Robert Speicher cabba95cde Fix failing user lookup feature test 2016-04-19 15:16:21 -04:00
Robert Speicher 5ac95d0f2b Remove persistent XSS vulnerability in commit_person_link helper 
See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1948
 2016-04-19 11:26:02 -04:00
Robert Speicher c00312909a Version 8.3.7 2016-04-07 18:10:26 -04:00
Robert Speicher 2ce848ddab Update VERSION to 8.3.7 v8.3.7 2016-04-07 18:07:36 -04:00
Robert Speicher a84b7fbcf1 Update gitlab-ci.yml so builds run 2016-04-07 15:01:19 -04:00
Rémy CoutableandRobert Speicher 6da54f2e8f Merge branch 'fix/2fa-authentication-spoofing' into 'master' 
Fix 2FA authentication spoofing

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-07 14:39:08 -04:00
Robert Speicher 1419bb1b94 Version 8.3.6 v8.3.6 2016-04-05 13:16:17 -04:00
Robert Speicher 8713136e25 Add 8.3.6 CHANGELOG item 
[ci skip]
 2016-04-05 13:00:49 -04:00
Stan HuandRobert Speicher 0aef4ef2cb Don't fetch any tags from a forked repo 
Closes #13957
 2016-04-05 09:40:22 -04:00
Robert Speicher 7e0d6cb6ae Version 8.3.5 v8.3.5 2016-03-17 18:14:36 -04:00
Robert Speicher d9a4e963ee Merge branch '8-3-git-2-7-4' into '8-3-stable' 
Bump Git version requirement to 2.7.4 (for 8.3)

[ci skip]

See merge request !3284
 2016-03-17 21:51:45 +00:00
Douwe Maan ee4d311ea6 Bump Git version requirement to 2.7.4 (for 8.3) 2016-03-17 22:32:11 +01:00
Jacob Vosmaer 59166702b8 Version 8.3.4 v8.3.4 2016-01-12 17:27:49 +01:00
Jacob Vosmaer dafb8c1b2b Add changelog entry for 8.3.4 2016-01-12 17:22:49 +01:00
Jacob Vosmaer 23181ec87a Use gitlab-workhorse 0.5.4 
Fixes routing errors for /api/v3/projects/

[ci skip]
 2016-01-12 16:56:52 +01:00
Robert Speicher e871216377 Version 8.3.3 v8.3.3 2016-01-11 15:27:39 -05:00
Robert Speicher b4217b9404 Add note on Asana tokens to 8.3 update guide 
[ci skip]
 2016-01-11 15:13:15 -05:00
Robert Speicher c76a17bd40 Update CHANGELOG 
[ci skip]
 2016-01-11 14:58:53 -05:00
Douwe MaanandRobert Speicher f89db395c0 Merge branch 'fix/project-destroy-callbacks' into 'master' 
Fix project destroy callback

See gitlab-org/gitlab-ee!107.

See merge request !2307
 2016-01-11 14:24:22 -05:00
Robert SpeicherandRobert Speicher 686909b4cd Merge branch 'gitlab-workhorse-0.5.3' into 'master' 
Use gitlab-workhorse 0.5.3

See merge request !2367
 2016-01-11 12:55:50 -05:00
Robert SpeicherandRobert Speicher 9e7942f565 Merge branch 'fix-ci-builds-for-tags' into 'master' 
Generate builds when creating tag using web interface

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

See merge request !2366
 2016-01-11 12:53:48 -05:00
Robert Speicher 3e6b71131f Update CHANGELOG 2016-01-11 12:36:20 -05:00
Douwe MaanandRobert Speicher 76ec8a112e Merge branch 'optimize_ldap' into 'master' 
Optimize LDAP and add a search timeout

Related to #4282 

This merge request arranges some things in `access.rb` to facilitate some optimizations in EE (to come later). It also adds a 10 second timeout to all LDAP searches so the entire worker is not blocked if some query doesn't return in a reasonable amount of time. This timeout is configurable per LDAP server.

See merge request !2267
 2016-01-11 12:33:16 -05:00
Dmitriy ZaporozhetsandRobert Speicher 56fed7f119 Merge branch 'rs-woff-fonts' into 'master' 
Use WOFF versions of SourceSansPro

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

See merge request !2357
 2016-01-11 12:21:40 -05:00
Dmitriy ZaporozhetsandRobert Speicher d295f74375 Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce 2016-01-11 12:16:57 -05:00
Stan HuandRobert Speicher 78d9c90438 Merge branch 'check-for-present-runner-token' into 'master' 
Fix Error 500 when visiting build page of project with nil runners_token

Properly ensure that the token exists and add defensively check for a
non-nil value.

Closes #4294

See merge request !2294
 2016-01-11 12:15:42 -05:00
Robert SpeicherandRobert Speicher a18ebb3c9e Merge branch 'fix_jira_shortterm' into 'master' 
Do not call API if there is no API URL

Fixes #5878 

CE users may not be interested in the new JIRA features. In this case,
we should detect they haven't set an API URL and fallback to the
behavior pre-8.3. This patch does that very easily.

There are planned improvements to JIRA in future releases such as
gitlab-org/gitlab-ce#5541 which will make this more configurable.

See merge request !2341
 2016-01-10 17:12:48 -05:00
Robert SpeicherandRobert Speicher 4a9293d352 Merge branch 'update-changelog-with-email-reply-fix' into 'master' 
Add CHANGELOG entry for reply-by-email fix

[ci skip]

See merge request !2359
 2016-01-10 17:10:44 -05:00
Stan HuandRobert Speicher 34d0f22637 Merge branch 'suppress-allow-failure-builds' into 'master' 
Suppress e-mails on failed builds if allow_failure is set

Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`.

@ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away.

See merge request !2178
 2016-01-08 13:14:23 -05:00
Robert SpeicherandRobert Speicher f076e4ebeb Merge branch 'merge-when-build-succeeds-unchecked' into 'master' 
Get "Merge when build succeeds" to work when commits were pushed to MR
target branch while builds were running

The Merge when build succeeds service only merges when the MR is
mergeable (open, not WIP, no conflicts).

When the target branch is updated, all affected MRs have their merge
status set to `unchecked`, and the conflicts check will only happen
when `check_if_can_be_merged` is called, which happens when the MR page
is viewed.

When someone enables the automatic merge, the target branch is updated,
no-one views the MR page again, and the build succeeds, the mergeability
check will fail and the MR will not in fact be merged.

This MR makes sure `check_if_can_be_merged` is always called when MR
mergeability is checked.

See merge request !2304
 2016-01-06 13:58:49 -05:00
Robert Speicher be19feca36 Revert "Merge branch 'debug-banzai-cache' into 'master'" 
This reverts commit 9c8ce4b6b5.
 2016-01-06 13:11:03 -05:00
Douwe MaanandRobert Speicher 8d5140502e Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' 
Better support for referencing and closing issues in asana_service.rb (by @mikew1)

See merge request !2302
 2016-01-05 17:57:47 -05:00
Robert Speicher 940d137bb5 Merge branch '8-3-stable' of github.com:gitlabhq/gitlabhq into 8-3-stable 2016-01-04 13:28:07 -05:00
Robert SpeicherandRobert Speicher 9c8ce4b6b5 Merge branch 'debug-banzai-cache' into 'master' 
Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/4130#note_3012511

See merge request !2283
 2016-01-04 13:21:39 -05:00
Douwe Maan 25974203b8 Merge pull request #9938 from huacnlee/hotfix/note_mail_with_notification 
Hotfix note mail with notification
 2016-01-04 12:11:13 +01:00
Jason Lee 99f3dc50ce Add test case for make sure SentNotification save a correct noteable value; 2015-12-31 11:50:54 +08:00
Jason Lee 94d0b15aca Fix email reply with a note. 
SentNotification need use `record_note` method to save right noteable
 2015-12-31 11:50:54 +08:00
Douwe MaanandRobert Speicher 01824a0fac Merge branch 'fix-add-key-submit' into 'master' 
Enable "Add key" button when user fills in a proper key

Closes #4295

See merge request !2208
 2015-12-30 16:50:02 -05:00
Robert SpeicherandRobert Speicher 8d8f52ac17 Merge branch 'fix-transfer-project-email' into 'master' 
Fix project transfer e-mail sending incorrect paths in e-mail notification

The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race
condition where the mailer would be invoked before the project was committed
to the database, causing the transfer e-mail notification to show the old
path instead of the new one.

Closes #4670

See merge request !2235
 2015-12-30 16:49:10 -05:00
Robert SpeicherandRobert Speicher db29304068 Merge branch 'fix-user-autocomplete' into 'master' 
Fixes problem with user autocomplete URI 

```
Failed to load resource: net::ERR_NAME_NOT_RESOLVED
http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false
```

Fixes #4118, #4136

See merge request !2136
 2015-12-30 14:56:38 -05:00
Grzegorz BizonandRobert Speicher e15ed58df9 Merge branch 'fix/missing-ci-build-traces' into 'master' 
Hotfix for builds trace data integrity

Closes #4246

See merge request !2224
 2015-12-30 14:55:40 -05:00
Robert Speicher 1211734e8d Update CHANGELOG 
[ci skip]
 2015-12-29 16:28:08 -05:00
Marin Jankovski fbb8b6e615 Version 8.3.2 v8.3.2 2015-12-29 13:22:57 +01:00