home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,378 Commits 48 Branches 340 Tags
efaa4e2386a201b889a099ae351d4eba8aa3c2f8
Commit Graph
22378 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher efaa4e2386 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 22:10:25 +00:00
Robert Speicher be76e402f9 Merge branch 'disable-blocked-in-abuse-reports' into 'master' 
Disable "Already Blocked" button in admin abuse report page

See merge request !2360
 2016-01-10 09:55:16 +00:00
Stan Hu 5f6b093445 Disable "Already Blocked" button in admin abuse report page 2016-01-09 21:25:18 -08:00
Stan Hu a8b444953b Add CHANGELOG entry for reply-by-email fix 
[ci skip]
 2016-01-09 17:08:49 -08:00
Achilleas Pipinellis c81647ae8c Merge branch 'doc_clean_up_add_users' into 'master' 
Clean up document on adding users to a project

Closes #3093, #3648

See merge request !2356
 2016-01-09 10:10:05 +00:00
Achilleas Pipinellis 11b4c0d3cf Clean up document on adding users to a project 
[ci skip]
 2016-01-09 11:03:10 +01:00
Robert Speicher 6d95444108 Merge branch 'cross-project-reference-typo-fix' into 'master' 
changes verb `references` to noun `reference`.

See merge request !2349
 2016-01-08 22:14:31 +00:00
Robert Speicher 00a68c3cb0 Remove Block Button from Abuse Reports page if User is Already Blocked 
An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667

See merge request !2313
 2016-01-08 22:02:34 +00:00
Robert Speicher 99eb647087 Add a CHANGELOG entry for The Most Important Feature of All Time(TM) 
Also, Open Graph data, if you're into that kind of thing.

[ci skip]
 2016-01-08 15:46:55 -05:00
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master' 
Add API project upload endpoint

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

See merge request !2329
 2016-01-08 20:29:43 +00:00
Robert Speicher 6467448a1a Merge branch 'blacklist-new' into 'master' 
Add 'new' as a reserved namespace name

Closes #5930

See merge request !2344
 2016-01-08 18:27:22 +00:00
Jacob Schatz b284ba24c2 changes verb references to noun reference. 2016-01-08 13:08:57 -05:00
Stan Hu 7403df6ca7 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 17:31:35 +00:00
Douwe Maan 0614793b38 DRY up upload and download services 2016-01-08 17:38:53 +01:00
Douwe Maan 8429f6f409 Merge branch 'rs-single-item-task-list-spec' into 'master' 
Add spec for single-item task lists

Follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2330

See merge request !2340
 2016-01-08 16:33:57 +00:00
Drew Blessing c1e974ed88 Merge branch 'issue_3076' into 'master' 
Fix problem with projects ending with .keys #3076

Closes #3076

Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys`

See merge request !1883
 2016-01-08 15:52:05 +00:00
Achilleas Pipinellis 255a63564b Merge branch 'docs_project_services' into 'master' 
Project services and JIRA documentation clean up

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176

This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more.

@Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well.

@dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better.

See merge request !2345
 2016-01-08 15:05:35 +00:00
Achilleas Pipinellis 65c474997d Add JIRA 7 to the supported versions 
[ci skip]
 2016-01-08 15:59:00 +01:00
Achilleas Pipinellis d09f1a4443 Remove useless assignment to variable 2016-01-08 15:22:42 +01:00
Yorick Peterse ec4a4f0623 Merge branch 'current-settings-handle-missing-db' into 'master' 
See merge request !2346
 2016-01-08 14:09:58 +00:00
Dmitriy Zaporozhets b64ec38aae Merge branch 'api-delete-tag' into 'master' 
Delete tag via API

### What does this MR do?

Implements deleting a tag via the API.

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

On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111).

###  What are the relevant issue numbers / Feature requests?

* This MR closes #1575 
* Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api

@stanhu Could you do a review?

See merge request !1862
 2016-01-08 13:47:42 +00:00
Yorick Peterse 8d7a968d6d Handle missing DBs in connect_to_db? 
This ensures CurrentSettings#connect_to_db? returns "false" in the event
of a database not existing, instead of raising an error.
 2016-01-08 14:31:39 +01:00
Achilleas Pipinellis fc7b14a534 Remove reference to EE from JIRA service model 2016-01-08 13:21:40 +01:00
Achilleas Pipinellis 1d48b180bc Clean up the JIRA integration document [ci skip] 
- new images where needed
- move images to a separate img directory
- use table for the service fields
- link to new documents
 2016-01-08 13:19:40 +01:00
Achilleas Pipinellis 629becde2f Split external issue tracker document 
[ci skip]
 2016-01-08 12:43:33 +01:00
Dmitriy Zaporozhets 08213ed4f5 Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master' 
Accept 2xx status codes for successful Web hook triggers

Closes https://github.com/gitlabhq/gitlabhq/issues/9956

See merge request !2332
 2016-01-08 10:56:39 +00:00
Dmitriy Zaporozhets 26a54ec34d Merge branch 'sorting-dropdown-order' into 'master' 
changes titles

Fixes #5909

See merge request !2334
 2016-01-08 10:28:47 +00:00
Dmitriy Zaporozhets 68eab8b277 Merge branch 'cross-project-reference-move' into 'master' 
adds reference to the bottom of sidebar

Fixes #4183 
![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png)


See merge request !2339
 2016-01-08 10:20:45 +00:00
Dmitriy Zaporozhets 45aea8c79c Merge branch 'banner-out-of-place' into 'master' 
css change to height to make gray container fit

Fixes #5893 
![Screen_Shot_2016-01-07_at_1.22.53_PM](/uploads/7bdd44a71d255fa1439e5b96af0bd48b/Screen_Shot_2016-01-07_at_1.22.53_PM.png)


See merge request !2337
 2016-01-08 10:19:46 +00:00
Achilleas Pipinellis b059fa5509 Clean up integration README 
[ci skip]
 2016-01-08 10:40:45 +01:00
Achilleas Pipinellis e4411a9612 Merge branch 'docs_project_services' into 'master' 
Update project services to include all supported ones

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/80

See merge request !2297
 2016-01-08 09:34:07 +00:00
Robert Schilling c3c0dda3f5 Blacklist 'new' 2016-01-08 10:19:22 +01:00
Dmitriy Zaporozhets 8f7c7bf670 Merge branch 'rs-remove-stamp' into 'master' 
Remove stamp gem

Closes #5908

See merge request !2323
 2016-01-08 09:17:31 +00:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Stan Hu e78ddb0973 Merge branch 'give-credit-to-kaiser-soze' into 'master' 
Give credit to user who created find file feature

[ci skip]

See merge request !2342
 2016-01-08 02:35:06 +00:00
Stan Hu 3c58b89b0e Give credit to user who created find file feature 
[ci skip]
 2016-01-07 18:34:00 -08:00
Robert Speicher 09dbe3752c Fix feature step 2016-01-07 20:23:13 -05:00
Robert Speicher 4408dc0bd1 Use xmlschema where even more appropriate! 2016-01-07 20:01:08 -05:00
Robert Speicher 6344493655 Use to_s(:iso8601) where appropriate 2016-01-07 20:01:08 -05:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Robert Speicher 59305715e9 Remove stamp gem 
Closes #5908
 2016-01-07 16:28:33 -05:00
Robert Speicher 65308a9c15 Add spec for single-item task lists 2016-01-07 15:25:39 -05:00
Jacob Schatz a652c56366 adds 85% width for text 2016-01-07 15:25:38 -05:00
Jacob Schatz 60aedb46d9 adds reference to the bottom of sidebar 2016-01-07 15:18:07 -05:00
Robert Speicher b1539116f6 Merge branch 'task-list-class' into 'master' 
Properly set task-list class on single item task lists

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

See merge request !2330
 2016-01-07 20:10:07 +00:00
Robert Speicher 87000b25f5 Merge branch 'gemfile-lock' into 'master' 
Update Gemfile.lock

My Bundler didn't agree with the previous order.

See merge request !2331
 2016-01-07 19:31:30 +00:00
Robert Speicher 90510f0037 Merge branch 'milestone-ref' into 'master' 
Link to milestone in "Milestone changed" system note

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

See merge request !2203
 2016-01-07 19:22:43 +00:00
Stan Hu 69209612e1 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 benchmarks and other specs that have `allow_failure` set to `true`.
 2016-01-07 10:45:39 -08:00
Jacob Schatz ad8366ed84 css change to height to make gray container fit 2016-01-07 13:23:17 -05:00
Dmitriy Zaporozhets 3c93e588e9 Merge branch 'annotate-models-20160105' into 'master' 
Annotate models

Time to refresh the comments via `annotate`.


See merge request !2311
 2016-01-07 18:22:32 +00:00