home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,060 Commits 48 Branches 340 Tags
268fb004c9917dfcbd4451354e4859ddff44005e
Commit Graph
23060 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 268fb004c9 Merge branch 'instrument-gitlab-git-repository' into 'master' 
Instrument Gitlab::Git::Repository



See merge request !2528
 2016-01-21 11:16:25 +00:00
Douwe Maan 54729d2c28 Merge branch 'ci/cache-key' into 'master' 
Added cache:key to .gitlab-ci.yml allowing to fine tune the caching

The `cache:key` allows you to define the affinity mask of caching, allowing to have single cache for all jobs, or cache per-job, or per-branch, or any other way you would need:

1. Cache per-build for all branches:

```
cache:
    key: "$CI_BUILD_NAME"
    untracked: true
```

2. Cache per-branch for all jobs:

```
cache:
    key: "$CI_BUILD_REF"
    untracked: true
```



/cc @DouweM @grzesiek @axil


See merge request !2436
 2016-01-21 11:15:28 +00:00
Yorick Peterse 7d1b51fac1 Instrument Gitlab::Git::Repository 
This adds instrumentation for the instance methods of
Gitlab::Git::Repository.
 2016-01-21 11:27:31 +01:00
Jacob Schatz a4ff270d59 Merge branch 'new-pagination' into 'master' 
Implement new UI for pagination

Fixes #6063 ![Screenshot_2016-01-20_09.38.59](/uploads/f50d333bdb6cb9683848fb0a874241ef/Screenshot_2016-01-20_09.38.59.png)


See merge request !2517
 2016-01-21 03:12:09 +00:00
Jacob Schatz ceab12866f Removes 100% width because it is a block element. 2016-01-20 21:27:01 -05:00
Dmitriy ZaporozhetsandJacob Schatz 8367e4abeb Implement new UI for pagination 2016-01-20 21:27:01 -05:00
Dmitriy Zaporozhets 1f9153b9a6 Merge branch 'ui-is-broken-in-search-result-page' into 'master' 
Fix term height so text overflap does not happen.

Fixes #12449 

Height was set on the `.term`. It made the text overlap. 

See merge request !2518
 2016-01-21 00:17:39 +00:00
Robert Speicher 4d84259df8 Merge branch 'fix-project-creation' into 'master' 
Creator should be added as a master of the project on creation

Fixes #4222 

This also enable a project creator to add themselves as a master of the
project for existing repositories that were created in the meanwhile
that they don't appear as members.

See merge request !2520
 2016-01-20 23:03:59 +00:00
Robert Speicher 3a6fac4a85 Remove Performance Monitoring from Integration docs 
[ci skip]
 2016-01-20 18:00:29 -05:00
Robert Speicher 3ae0ca8941 Update CHANGELOG 
[ci skip]
 2016-01-20 17:47:18 -05:00
Dmitriy Zaporozhets 1667d2134c Merge branch 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master' 
Adds disabled comment field and disabled avatar.

Fixes #3540

![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png)


See merge request !2508
 2016-01-20 22:27:40 +00:00
Kamil Trzcinski c45a6bf3ba Added cache:key to .gitlab-ci.yml allowing to fine tune the caching 2016-01-20 23:12:48 +01:00
Achilleas Pipinellis fa9d306b01 Merge branch 'metrics-documentation' into 'master' 
Added documentation for GitLab Metrics

This adds documentation for the metrics code I recently added.

Two notes:

* I'm referring to this feature as "GitLab Metrics" everywhere simply
  because the code resides in the `Gitlab::Metrics` namespace. A
  different name is fine, though I think just "Metrics" might be a bit
  too abstract.
* Grafana isn't covered since it's fairly straight-forward to setup
  (there's nothing really special we can cover). I think we _should_
  cover it once we start shipping it with Omnibus.

I assigned @axil since he's our technical writer/documentation guru,
feel free to re-assign if needed.

cc @sytses @axil @dzaporozhets @JobV 

See merge request !2484
 2016-01-20 22:12:25 +00:00
Robert Speicher 3e7092a83a Merge branch 'fix-github-pull-requests-import' into 'master' 
Fix cross projects detection when importing GitHub pull requests

Fixes #12456

See merge request !2523
 2016-01-20 22:11:20 +00:00
Achilleas Pipinellis dd59fc213c Change InfluxDB admin username 
[ci skip]
 2016-01-20 23:10:27 +01:00
Douglas Barbosa Alexandre 096485ef65 Creator should be added as a master of the project on creation 
This also enable a project creator to add themselves as a master of the
project.
 2016-01-20 20:06:28 -02:00
Achilleas Pipinellis 82bc7679e7 Move integration/metrics to monitoring/performance 
[ci skip]
 2016-01-20 23:02:24 +01:00
Robert Speicher 348129d021 Merge branch 'issue_3945' into 'master' 
Add syntax highlighting to diff view

Closes #3945 

See merge request !2109
 2016-01-20 21:52:05 +00:00
Achilleas Pipinellis 41d22a1f0d Merge branch 'ruby_version' into 'master' 
Mention required Ruby version

Closes #12446

See merge request !2524
 2016-01-20 21:43:49 +00:00
Douglas Barbosa Alexandre f4bdbecfd5 Fix cross projects detection when importing GitHub pull requests 2016-01-20 19:36:35 -02:00
Achilleas Pipinellis cd7f27543b Mention required Ruby version 
[ci skip]
 2016-01-20 22:32:10 +01:00
Rubén Dávila 985297d82a Merge branch 'master' into issue_3945 2016-01-20 15:07:00 -05:00
Achilleas Pipinellis 714f95b2ff Merge branch 'patch-1' into 'master' 
Add note about minimum GitLab CI version

Documentation update: To use variables in `.gitlab-ci.yml` it's not enough to update the GitLab Runner, a minimum version of GitLab CI is needed as well.

See merge request !2514
 2016-01-20 20:04:43 +00:00
Rubén Dávila 86b75f4713 Use a MR with commits. 2016-01-20 14:41:23 -05:00
Robert Speicher 1553c560e0 Merge branch 'feature/check-against-rbl-only' into 'master' 
Split from !2455

References #9092

See merge request !2515
 2016-01-20 14:24:20 -05:00
Douwe Maan 7d347ae564 Merge branch 'master' into issue_3945 2016-01-20 20:04:15 +01:00
Robert Speicher a8a65afe1e Merge branch 'fix-error-500-with-invalid-utf8' into 'master' 
Gracefully handle invalid UTF-8 sequences in Markdown links

Closes #6077

See merge request !2382
 2016-01-20 19:03:32 +00:00
Robert Speicher e3c43ca7d0 Merge branch 'sentry-integration' into 'master' 
Add sentry integration

Sentry is an event logging platform primarily focused on capturing and
aggregating exceptions. With this MR it will be possible to log and
track exceptions from GitLab to Sentry.

https://gitlab.com/gitlab-com/operations/issues/39

See merge request !2485
 2016-01-20 19:00:35 +00:00
Robert Speicher 67bd2ed3a2 Merge branch 'adjust-unicorn-memory-limits' into 'master' 
Use ENV variables for Unicorn worker killer & increase default limits

Merge request that lead to this particular merge request:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2421

[ci skip]

See merge request !2513
 2016-01-20 18:44:51 +00:00
Douwe Maan 6000f8545f Validate bounds just to be sure 2016-01-20 19:33:34 +01:00
Douwe Maan 2d8b6901ba Merge branch 'update-gitlab_git' into 'master' 
Upgraded gitlab_git to fix issue #5858

This updates the dependency on gitlab_git and fixes #5858 - reproduced locally and issue disappears with the change.

Related MR that actually adds branch name support to commits_between: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/61

See merge request !2516
 2016-01-20 18:24:58 +00:00
Jacob Schatz 34b132d49a Fix term height so text overflap does not happen. 2016-01-20 13:24:52 -05:00
Douwe Maan 0e992a3b4e Properly highlight lines around '\ No newline at end of file' 2016-01-20 19:20:13 +01:00
Dmitriy Zaporozhets 7c01a91bb7 Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' 
Fixes tooltip doesn't duplicate the "me" name.

Checks that "me" is not in the array of names in tooltip

![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif)

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


See merge request !2454
 2016-01-20 17:50:00 +00:00
Douwe Maan 577f2fb47a Save and use actual diff base commit for MR diff highlighting 2016-01-20 18:44:27 +01:00
Dmitriy Zaporozhets 5ad60c5dda Merge branch 'secret-shortcut-feature' into 'master' 
Adds "t" as a shortcut for find file anywhere



See merge request !2507
 2016-01-20 16:39:43 +00:00
Douwe Maan 26f7d023e6 Update tests 2016-01-20 17:14:26 +01:00
James Lopez 419a5e00eb updated gitlab_git to fix issue #5858 and updated changelog 2016-01-20 17:12:30 +01:00
Achilleas Pipinellis 41c5c391b3 Merge branch 'patch-1' into 'master' 
Fixed invalid JSON in first JSON Example

Just a comma missing

See merge request !2487
 2016-01-20 16:12:00 +00:00
Jacob Schatz 7377abf84a Simplifies the HAML if statement for project branch URL 2016-01-20 10:50:26 -05:00
Douwe Maan 7838c957c2 Target '_blank' 2016-01-20 16:18:42 +01:00
Douwe Maan 0ad6b44a27 Send user context to Sentry 2016-01-20 16:15:19 +01:00
Stan Hu a10ab94b06 Gracefully handle invalid UTF-8 sequences in Markdown links 
Closes #6077
 2016-01-20 07:07:53 -08:00
Douwe Maan b4faa59728 Merge branch 'issue_3749' into 'master' 
Update Issues/MRs updated_at field when notes are generated

Closes #3749 and #9130

See merge request !2493
 2016-01-20 15:06:49 +00:00
Douwe Maan 987e3d94b0 Fix MR diff_refs 2016-01-20 15:40:49 +01:00
Douwe Maan f8f96994f7 Merge branch 'ci/artifacts-remove-compressed-size' into 'master' 
Remove `Compressed to` column from build artifacts browser

See #10982.

See merge request !2509
 2016-01-20 14:33:01 +00:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Douwe Maan a010db5db2 Properly handle HTML entities with inline diffs 2016-01-20 15:26:44 +01:00
Douwe Maan 88bd138513 Restore helper 2016-01-20 14:59:14 +01:00
Douwe Maan c23ca0b0b5 Merge branch 'master' into issue_3945 2016-01-20 14:53:41 +01:00