Commit Graph
27522 Commits
Author SHA1 Message Date
Kamil Trzcinski 1ad0c968d5 Make a build views nicer 2016-05-09 23:39:48 +03:00
Kamil Trzcinski cb90368a69 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-04-26 16:36:17 +02:00
Kamil Trzcinski c6f19aed51 Fix builds rendering bug 2016-04-26 16:36:06 +02:00
Jacob Vosmaer f127edd012 Merge branch '15094-throttle-update-of-last_activity_at' into 'master'
Throttle the update of `project.last_activity_at` to 1 minute

This implement [the solution](https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4769387) proposed by @jacobvosmaer.

See merge request !3848
2016-04-26 09:34:51 +00:00
Robert Speicher 6ff740ff94 Merge branch 'upgrade-gitlab-grit' into 'master'
Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency.

Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc

Resolves #15101.

See merge request !3901
2016-04-25 22:26:13 +00:00
Robert Speicher 48f516a843 Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master'
Link user avatar in activity page to user profile

Closes #14927

See merge request !3910
2016-04-25 21:34:37 +00:00
Jacob Schatz 9182c93c00 Merge branch 'fix-changelog' into 'master'
Move CHANGELOG entry to 8.8

Fixes CHANGELOG entry for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3686

See merge request !3914
2016-04-25 20:15:08 +00:00
Jacob Schatz 8fc0eed357 Merge branch 'emoji-unicode-fix' into 'master'
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
2016-04-25 20:04:35 +00:00
Jacob Schatz 3d115d6748 Merge branch 'diff-line-colors' into 'master'
Update diff blue & yellow to match design

<img src="/uploads/60e1351fb04ab1c8969685fbc8b61c88/Screen_Shot_2016-04-22_at_9.12.17_AM.png" width="500px">
<img src="/uploads/6812b22ec53f3041811261daa0584822/Screen_Shot_2016-04-22_at_9.12.05_AM.png" width="500px">

See merge request !3883
2016-04-25 19:30:15 +00:00
Achilleas Pipinellis ad46466cb9 Merge branch 'fix/ci-docker-images-documentation' into 'master'
Replace '-n' with '--name' in docker related documentation

`-n` for `docker run` is outdated. We should use `--name` instead. This MR fixes the example in documentation.

Fixes #15174

See merge request !3908
2016-04-25 19:29:02 +00:00
Achilleas Pipinellis 19fc0ea776 Merge branch 'fix/ci-php-docker-example' into 'master'
Fix php-docker example (for new docker versions)

`/.dockerinit` file doesn't exists in new Docker versions. Instead `/.dockerenv` can be used. This MR fixes the PHP example which was working only for older Docker versions.

Fixes gitlab-org/gitlab-ci-multi-runner#1241

See merge request !3907
2016-04-25 19:28:35 +00:00
Jacob Schatz 103b1444bd Merge branch 'blur-award-btn' into 'master'
Triggers blur after clicking award button

![blur](/uploads/6cd53a5ac314e8048c656685935747e2/blur.gif)

Fixes #15511

See merge request !3881
2016-04-25 19:27:36 +00:00
Alfredo Sumaran 1a79613df2 Move CHANGELOG entry to 8.8 2016-04-25 14:21:55 -05:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master'
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
2016-04-25 19:13:25 +00:00
Jacob Schatz af569f32e9 Merge branch 'project-dropdown-link-click-fix' into 'master'
Fixed issue with project dropdown links not being clickable



See merge request !3870
2016-04-25 18:47:30 +00:00
Jacob Schatz 99c4513eaa Merge branch 'word-break' into 'master'
Don't break line in middle of word

<img src="/uploads/cceb1a4212ff7785ace03cd6468edf85/Screen_Shot_2016-04-21_at_3.32.00_PM.png" width="500px">

See merge request !3864
2016-04-25 18:42:14 +00:00
Robert Speicher f89fea54e4 Merge branch 'fix/error-on-builds-page' into 'master'
Fix error on commit builds page

This MR fixes error on commit builds page that occurs before CI commit
(Pipeline) had been updated.

Closes #15509

See merge request !3874
2016-04-25 17:23:55 +00:00
Dmitriy Zaporozhets b79c5c40e1 Merge branch 'rs-503-page' into 'master'
Add a branded 503 static error page

[ci skip]

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

See merge request !3894
2016-04-25 17:13:23 +00:00
Grzegorz Bizon b822f65a52 Add Changelog entry for commit builds page fix 2016-04-25 18:39:58 +02:00
Robert Speicher c295f0d2cc Merge branch 'update-jquery-rails' into 'master'
Upgrade jQuery Rails from 4.0.5 to 4.1.1

Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1.

Changelogs:
- https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md
- https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/
- https://github.com/rails/jquery-ujs/releases

See merge request !3642
2016-04-25 16:12:08 +00:00
Rémy Coutable 533cd8c2ee Throttle the update of project.last_activity_at to 1 minute
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-25 17:25:46 +02:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet
Closes #15509
2016-04-25 17:19:57 +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
Arinde Eniola 0c0f634050 link user avatar in activity page to user profile 2016-04-25 13:13:43 +01: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
Tomasz Maczukin 9bd0f46a85 Replace '-n' with '--name' in docker related documentation
[ci skip]
2016-04-25 12:13:50 +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
Tomasz Maczukin c55f517719 Fix php-docker example (for new docker versions)
[ci skip]
2016-04-25 11:35:33 +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
Connor Shea 49961bff66 Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency.
Resolves #15101.
2016-04-24 16:34:57 -06: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
Phil Hughes 13f7ba059e Removed usage of normilizeEmojiName method
Fixed some Ruby based on feedback
2016-04-22 21:53:26 +01: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
Robert Speicher d85f65ef4e Add a branded 503 static error page
[ci skip]

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
2016-04-22 16:26:42 -04: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