Commit Graph
11226 Commits
Author SHA1 Message Date
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
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 d09f1a4443 Remove useless assignment to variable 2016-01-08 15:22:42 +01:00
Achilleas Pipinellis fc7b14a534 Remove reference to EE from JIRA service model 2016-01-08 13:21:40 +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
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
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 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
Jacob Schatz df18441e09 changes titles 2016-01-07 12:59:45 -05:00
Stan Hu 8386edafd1 Accept 2xx status codes for successful Web hook triggers
Closes https://github.com/gitlabhq/gitlabhq/issues/9956
2016-01-07 06:28:24 -08:00
Dmitriy Zaporozhets c7fc84f516 Use fadeTo instead of css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets 44dc9aa69e Fix typo in js method and some repeating css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets 4443a5f3c7 Add support for ref and path to commits filtering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets b2b4e9a7eb Prevent loading first 20 commits twice
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets d1a40e06cc Add ajax filtering for commits list
Also handle commits list with Pager class to prevent code duplication

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets 5e93f912c3 Add search field to commits page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets 9a250ad6d8 Filter commits by search parameter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:10 +01:00
Dmitriy Zaporozhets 8d0886d6d0 Merge branch 'fix-missing-day-in-network-graph' into 'master'
Fix missing date of month in network graph when commits span a month

Closes #3635, #1383

Before:

![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png)

After:

![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png)


See merge request !2325
2016-01-07 12:10:57 +00:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Douwe Maan 539b41929b Milestone reference is a Markdown link 2016-01-07 12:26:05 +01:00
Yorick Peterse ee9432a79a Merge branch 'remove-influxdb-credentials' into 'master'
See merge request !2319
2016-01-07 09:12:08 +00:00
Stan Hu 7d013f7848 Fix missing date of month in network graph when commits span a month
Closes #3635, #1383
2016-01-06 21:05:46 -08:00
Robert Speicher d47b3e63d5 Merge branch 'more-opengraph' into 'master'
Add Open Graph data for group, project and commit.

See merge request !2211
2016-01-06 19:11:05 +00:00
Robert Speicher b93744e300 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 18:58:10 +00:00
Robert Speicher 623fa2caf7 Merge branch 'fix-banzai-cache' into 'master'
Fix mentionable reference extraction caching.

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

Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283

See merge request !2315
2016-01-06 18:11:46 +00:00
Yorick Peterse 8fdc00bd4c Remove InfluxDB username/password
InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.
2016-01-06 17:49:56 +01:00
Janis Meybohm da53fcba2d Enable Microsoft Azure OAuth2 support 2016-01-06 14:30:43 +01:00
Stan Hu 79c0e7212a Annotate models 2016-01-06 13:09:55 +00:00
Douwe Maan 8b39b8cd54 Merge branch 'fix/project-destroy-callbacks' into 'master'
Fix project destroy callback

See gitlab-org/gitlab-ee!107.

See merge request !2307
2016-01-06 13:00:50 +00:00
Douwe Maan 37ce5f312e Fix mentionable reference extraction caching. 2016-01-06 13:33:11 +01:00
Douwe Maan 2474a5921f Merge branch 'master' into milestone-ref 2016-01-06 13:06:50 +01:00
Douwe Maan 639d428046 Merge branch 'master' into more-opengraph 2016-01-06 13:06:25 +01:00
Douwe Maan c0849101e6 Merge branch 'master' into merge-when-build-succeeds-unchecked 2016-01-06 13:06:01 +01:00
Douwe Maan 384445eca6 Don't override issue page description in project layout. 2016-01-06 13:02:51 +01:00
Robert Speicher 52e41dcac4 Fix the abuse report detail URL in the HTML email template 2016-01-05 18:02:12 -05:00
Robert Speicher d453b24aca Merge branch 'validate-readme-format' into 'master'
Validate README format

Take the first previewable README file as project's README, otherwise if
none file is available, or we can't preview any of them, we assume that
project doesn't have a README file.

Fixes #3978
2016-01-05 17:03:24 -05:00
Robert Speicher 6d3b5ea2a9 Remove now-redundant page_description call from Groups#show 2016-01-05 16:47:09 -05:00
Robert Speicher a0793d69c5 Remove now-redundant page_description call from Projects#show 2016-01-05 15:02:42 -05:00
Robert Speicher 43053c2e6f Make page_description less magical 2016-01-05 14:54:59 -05:00
Robert Speicher a298f69432 Use User#avatar_url instead of avatar_icon helper 2016-01-05 14:50:52 -05:00