home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,540 Commits 48 Branches 340 Tags
cbbc42e0c4e5888413a690a4e0760e3cadd55a63
Commit Graph
27540 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Lopez cbbc42e0c4 adding more UI changes, updated controller, worker and refactored import service 2016-04-26 17:12:50 +02:00
James Lopez 1d4c3fa150 more refactoring, now using custom job for processing project imports 2016-04-26 13:01:51 +02:00
James Lopez 28b0208e93 refactoring, mainly UI stuff to follow other import actions 2016-04-26 10:59:00 +02:00
James Lopez 4037a73894 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-04-25 18:06:24 +02:00
James Lopez 22ff009a54 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-04-25 18:01:58 +02:00
James Lopez 10f1609535 changes to be picked by the UI branch 2016-04-25 18:00:15 +02:00
Yorick Peterse 81cb636e4f 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 14:57:16 +00:00
Stan Hu 6dff1a9a2b Fix Error 500 due to stale cache when projects are renamed or transferred 
Closes gitlab-org/gitlab-ee#506
 2016-04-25 06:57:50 -07:00
Jacob Schatz be85fde663 Merge branch 'scss-empty-rule' into 'master' 
Enable the EmptyRule SCSS Linter

Prevents empty SCSS rules from being included in the SCSS.

Also fixes the handful of lints caught by the linter.

Regarding the `.gh` rule in monokai.scss, which was added in [this commit](https://gitlab.com/gitlab-org/gitlab-ce/commit/bf079c24afb8ad2991a4eaf60a71a7bc45dd775d), it appears to be empty in [the original file as well](https://github.com/richleland/pygments-css/blob/master/monokai.css). So I think it's fine to delete the selector.

cc: @jschatz1 

See merge request !3769
 2016-04-25 11:30:50 +00:00
Yorick Peterse 35c7763c6c Merge branch 'new-list-of-influxdb-queries' into 'master' 
Updated list of InfluxDB queries/config

See merge request !3840
 2016-04-25 11:10:51 +00:00
Yorick Peterse 76c2594a6a Updated list of InfluxDB queries/config 
This setup is quite a bit different from before. In the previous setup
raw data was kept around for 30 days and downsampled data for 7 days.
This became problematic for GitLab.com as the number of points and
series resulted in InfluxDB running out of memory when starting up
(besides taking up 30 GB of storage).

To work around this the new setup keeps raw data around for _only_ an
hour while keeping downsampled data around for 7 days. In turn all
Grafana dashboards _only_ query the downsampled data instead of also
querying raw data.

Based on rough calculations this setup needs around 2GB of storage for 1
week of data, excluding whatever is needed for storing the raw data
(this highly depends on the amount of traffic).

If users want to use this new setup they have to remove any existing
dashboards provided by GitLab.com and re-import the ones from the
Grafana dashboards repository
(https://gitlab.com/gitlab-org/grafana-dashboards/). Should users wish
to change their default retention policy the easiest way of doing so is
to simply drop the database and re-run the InfluxDB commands added by
this commit. Users who want to keep their default retention policy as-is
can simply create the "downsampled" policy and run the other commands.
 2016-04-25 12:18:55 +02:00
Rémy Coutable 793a766463 Fix 8.7.1 CHANGELOG 
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 11:58:20 +02:00
Rémy Coutable abf15a9646 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2016-04-25 11:57:38 +02:00
Rémy Coutable fffc8a8691 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 09:29:41 +00:00
Rémy Coutable 41aa7a89fb 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
 2016-04-25 09:26:58 +00:00
Rémy Coutable b8c4a65da7 Fix license detection to detect all license files, not only known licenses 
Fixes #15470.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 10:31:28 +02:00
Rémy Coutable 2eee6a0cbc Merge branch 'fix/hidden-build-validation-in-ci-yaml' into 'master' 
Add posibility to define a hidden job without 'script' in .gitlab-ci.yml

References #15451

/cc @ayufan 

See merge request !3849
 2016-04-25 08:28:27 +00:00
Stan Hu 9413dd80f5 Prevent users from deleting Webhooks via API they do not own 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
 2016-04-24 23:53:59 -07:00
Robert Speicher 954af77b39 Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master' 
Hiding future dates on contribution calendar

Fixes #9036

See merge request !2628
 2016-04-24 19:57:56 +00:00
Jacob Schatz 1cfd41591b Merge branch 'rs-todo-middle-click' into 'master' 
Allow middle-click on a Todo row to open in a new tab



See merge request !3899
 2016-04-24 19:52:00 +00:00
Luke Howell 2dd4f796b1 Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. 2016-04-24 14:14:29 -05:00
Robert Speicher aace81ca37 Allow middle-click on a Todo row to open in a new tab 2016-04-24 15:01:52 -04:00
Achilleas Pipinellis 7acea6bde9 Merge branch 'add-tags-to-fetch' into 'master' 
Add --tags to fetching gitlab-shell to ensure tags are downloaded

Closes #15525

See merge request !3896
 2016-04-23 05:54:22 +00:00
Stan Hu 06f35914da Add --tags to fetching gitlab-shell to ensure tags are downloaded 
Closes #15525
 2016-04-22 16:06:24 -07:00
Robert Speicher b1adff828c Merge branch 'upgrade-sidekiq' into 'master' 
Update Sidekiq and related gems (bundle update sidekiq)

Closes #15079

See merge request !3817
 2016-04-22 23:03:07 +00:00
Robert Speicher c56da88115 Merge branch 'rs-update-binstubs' into 'master' 
Re-generate Spring binstubs for updated version of Spring

Prevents output like this:

    Array values in the parameter are deprecated. Please use a String or nil.
    An Array was passed in from bin/rspec:3:in `load'

See merge request !3887
 2016-04-22 20:48:20 +00:00
Tomasz Maczukin 4b23b5cdf4 Move CHANGELOG entry to 8.7.1 2016-04-22 22:09:50 +02:00
Tomasz Maczukin 9a1b174d5c Fix some typos 2016-04-22 22:08:38 +02:00
Tomasz Maczukin a2e2989637 Modify code formatting 2016-04-22 22:08:37 +02:00
Tomasz Maczukin 5018d7d5b7 Update CHANGELOG 
[ci skip]
 2016-04-22 22:08:36 +02:00
Tomasz Maczukin 0ccf629525 Simplify the GitlabCiYamlProcessor#initial_parsing method 2016-04-22 22:08:36 +02:00
Tomasz Maczukin e1b3ce5468 Fix formatting 2016-04-22 22:08:35 +02:00
Tomasz Maczukin 8dd27b47ea Add posibility to define a hidden job without 'script' in .gitlab-ci.yml 2016-04-22 22:08:34 +02:00
Robert Speicher fdc8b05ab1 Re-generate Spring binstubs for updated version of Spring 
Prevents output like this:

    Array values in the parameter are deprecated. Please use a String or nil.
    An Array was passed in from bin/rspec:3:in `load'
 2016-04-22 16:00:56 -04:00
Drew Blessing 80893cad67 Merge branch 'ha_docs' into 'master' 
Fix broken link in HA docs

Whoops! Fix broken link in docs from gitlab-org/gitlab-ce!3579

See merge request !3890
 2016-04-22 18:25:49 +00:00
Drew Blessing 0bb85509c9 Fix link 2016-04-22 13:24:36 -05:00
Drew Blessing 56f66e4cf4 Merge branch 'ha_docs' into 'master' 
Updated HA docs and open to public

Closes https://dev.gitlab.org/gitlab/organization/issues/624

We still need to go through the old gitlab.com/standard/high-availability and move relevant docs over, plus do some docs on DRBD. However, I think this is a good volume for the first pass. Can we get this out there and then iterate?

cc/ @axil @patricio For your review, please.

See merge request !3579
 2016-04-22 18:18:55 +00:00
Drew Blessing 34ea1d2cfe New HA docs [ci skip] 2016-04-22 13:18:06 -05:00
Drew Blessing c38f2645ed Merge branch 'sidekiq_troubleshooting' into 'master' 
Add Sidekiq troubleshooting docs

Closes #15287 

cc/ @stanhu @jacobvosmaer @dstanley

See merge request !3802
 2016-04-22 18:13:03 +00:00
Drew Blessing 3e16997fd7 Add Sidekiq troubleshooting docs [ci skip] 2016-04-22 13:11:53 -05:00
Robert Speicher d83d43c553 Merge branch 'rs-todos-feature-spec' into 'master' 
Refactor Todos feature spec to be faster and less brittle

We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.

See merge request !3889
 2016-04-22 17:51:08 +00:00
Robert Speicher 84d3649d57 Merge branch '15513-fix-undefined-can-method' into 'master' 
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
 2016-04-22 17:38:10 +00:00
Robert Speicher bdd844f312 Refactor Todos feature spec to be faster and less brittle 
We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.
 2016-04-22 13:08:11 -04:00
Jacob Schatz 7d199b7fcc Merge branch 'escape-label-title' into 'master' 
Correctly escapes label title in filters

Fixes #15522

See merge request !3880
 2016-04-22 15:56:54 +00:00
James Lopez e5a59331cf remove debug statement 2016-04-22 17:56:20 +02:00
James Lopez acf297955a gitlab import UI - icon, file selector, etc... Also updated font-awesome and modified import source settings. 2016-04-22 17:44:59 +02:00
Robert Speicher 10aaea1c91 Merge branch 'fix/cherry-pick-specs-location' into 'master' 
Move cherry-pick feature specs to proper directory

Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`.

Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`).

See merge request !3875
 2016-04-22 15:33:23 +00:00
Achilleas Pipinellis c75b350cef Merge branch 'doc/gitlab-shell-tag' into 'master' 
Bump gitlab-shell to 2.7.2

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

See merge request !3884
 2016-04-22 15:16:49 +00:00
Achilleas Pipinellis f063c3184b Bump gitlab-shell to 2.7.2 
[ci skip]
 2016-04-22 18:15:03 +03:00
Rémy Coutable c56ae831db Merge branch 'issue_3799' into 'master' 
Add tests for filtering owned projects

REF: #3799

See merge request !3873
 2016-04-22 15:11:14 +00:00