Commit Graph
24915 Commits
Author SHA1 Message Date
Kamil Trzcinski 3da55e37d0 Retry bundler and apt-get 2016-03-09 21:22:25 +01:00
Dmitriy Zaporozhets fdfcc1ac0d Merge branch 'rs-sprite-task' into 'master'
Add a `gemojione:sprite` Rake task

This task will generate a standard and Retina sprite of all of the
current Gemojione Emojis, with the accompanying SCSS map.

It will not appear in `rake -T` output, and the dependent gems are not
included in the Gemfile by default, because this task will only be
needed occasionally.

See merge request !3130
2016-03-09 19:32:08 +00:00
Douglas Barbosa Alexandre 00a19f323b Merge branch 'fix-todos' into 'master'
Fix error 500 in Todos

Closes #14095 

Closes #14075 

Closes #14109

Closes #14151

See merge request !3141
2016-03-09 19:22:43 +00:00
Douglas Barbosa Alexandre b100a9f206 Update CHANGELOG 2016-03-09 16:21:53 -03:00
Douglas Barbosa Alexandre 7500a12aae Avoid error 500 when todo author was removed 2016-03-09 14:47:04 -03:00
Robert Speicher e443c7c6d8 Add a gemojione:sprite Rake task
This task will generate a standard and Retina sprite of all of the
current Gemojione Emojis, with the accompanying SCSS map.

It will not appear in `rake -T` output, and the dependent gems are not
included in the Gemfile by default, because this task will only be
needed occasionally.

[ci skip]
2016-03-09 12:44:48 -05:00
Jacob Schatz 48fc02d24c Merge branch 'snippet-visibility-spacing' into 'master'
Snippet visibility badge spacing

Closes #14074 

![Screen_Shot_2016-03-08_at_08.40.32](/uploads/f55ca724fbf0e247b299a2702c3b55f5/Screen_Shot_2016-03-08_at_08.40.32.png)

See merge request !3122
2016-03-09 17:39:14 +00:00
Jacob Vosmaer 5e46662798 Merge branch 'commit-limits' into 'master'
Commit limits

Prevent timeouts when creating/viewing Merge Requests with many
commits. Also, reduce the number of commits shown in the UI from 500
to 100.

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

This MR avoids Unicorn timeouts in some places and takes 4.5 seconds
off load times in others, when manually testing with a 4500-commit
compare/MR in the linux repo. It does not limit the number of Commit
objects instantiated in memory, just the amount of HTML generated. It
seems that having 4500 commits objects is not a problem in itself. If
it ever becomes one we could do something for Commit objects like we
did for Diff (introduce a CommitCollection or something).

See merge request !3095
2016-03-09 16:39:07 +00:00
Dmitriy Zaporozhets e72ae40c95 Merge branch 'rs-bump-poltergeist' into 'master'
Bump poltergeist to `~> 1.9.0`



See merge request !3116
2016-03-09 16:15:34 +00:00
Douglas Barbosa Alexandre cac83cead5 Update CHANGELOG 2016-03-09 11:18:37 -03:00
Douglas Barbosa Alexandre 22140ced0b Remove invalid todos from database 2016-03-09 11:18:13 -03:00
Kamil Trzciński 5956ddd8b2 Merge branch 'retry-tests' into 'master'
Retry failed tests

This is to make the CI builds more reliable due to large amount of timeouts and deadlocks recently.


See merge request !1793
2016-03-09 14:08:19 +00:00
Douglas Barbosa Alexandre 9e342fb00a Destroy all related todos when removing a project 2016-03-09 11:06:58 -03:00
Kamil Trzcinski b651cd227e Fix script error 2016-03-09 14:26:49 +01:00
Kamil Trzcinski 978703abe2 Retry apt-get installation and bundle install 2016-03-09 14:22:32 +01:00
Kamil Trzcinski af43401602 Retry spinach tests 2016-03-09 14:22:32 +01:00
Kamil Trzcinski 640bf8ab72 Retry failed tests 2016-03-09 14:21:19 +01:00
Rémy Coutable 500337c4b2 Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master'
Fix bug where Bitbucket 'closed' issues were imported as 'opened'

_Originally opened at !2930 by @iurisilvio._

- - -

Bitbucket has an undocumented status `closed`.

https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html

Related to https://gitlab.com/gitlab-com/support-forum/issues/559

See merge request !2973
2016-03-09 12:54:52 +00:00
Yorick Peterse 2af9326c34 Merge branch 'update-db-schema' into 'master'
See merge request !3136
2016-03-09 12:53:55 +00:00
Yorick Peterse c666441d40 Added main_language to the schema
This wasn't included in gitlab-org/gitlab-ce!3000.
2016-03-09 12:35:24 +01:00
Jacob Vosmaer 9d9d2fbbc2 Prevent performance issues 2016-03-09 12:00:17 +01:00
Achilleas Pipinellis 0ab52373c3 Merge branch 'fix/upgrader-docs' into 'master'
Fix master branch link to upgrader.md



See merge request !2967
2016-03-09 09:54:13 +00:00
Dmitriy Zaporozhets b0b72c3bd4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-03-09 10:13:20 +01:00
Dmitriy Zaporozhets 0f14980383 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-03-09 10:13:09 +01:00
Dmitriy Zaporozhets 68f1535ab6 Merge branch 'rs-traits-are-good' into 'master'
Make better use of the `visibility_level` factory traits



See merge request !3131
2016-03-09 09:12:26 +00:00
Dmitriy Zaporozhets bc14d81af0 Merge branch 'rs-snippets-dont-expire' into 'master'
Remove `Snippet#expires_at`

This was removed from the interface in
https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation
lingered around for two years.

See merge request !3103
2016-03-09 09:02:17 +00:00
Dmitriy Zaporozhets c674ffe0e0 Merge branch 'improve-archived-projects' 2016-03-09 09:51:59 +01:00
Jonas Friedmann 0853628cbf Fix URL to upgrader guide 2016-03-09 08:26:39 +01:00
Robert Speicher b900304c38 Make better use of the visibility_level factory traits 2016-03-08 16:40:45 -05:00
Robert Speicher 7000e76a01 Simplify the various Snippet factories 2016-03-08 16:40:27 -05:00
Robert Speicher e8cd04e831 Merge branch 'branch-tag-count-methods' into 'master'
Use dedicated methods for counting branches and tags

This started out as "Lets add two methods to count and cache some data" and ended up in a clean-up/fix of some existing code. The two problems were:

1. Different code was used for adding/removing branches/tags via Git and the UI
2. The code used for the UI didn't have any RSpec tests, and I couldn't find any Spinach tests either (though grepping for Spinach stuff is hard)

This MR addresses the following:

1. `Repository#branch_count` and `Repository#tag_count` are used to count and cache the number of branches/tags, these methods are then used on the branches/commits/tags pages.
2. `Repository#add_tag`, `Repository#add_branch`, `Repository#rm_tag` and `Repository#rm_branch` now all the appropriate before/after hook methods instead of calling a random single cache expiration method. This ensures caches are properly flushed when adding/removing tags/branches via the UI.
3. RSpec tests were added for the above methods.

This fixes gitlab-org/gitlab-ce#13459

See merge request !3128
2016-03-08 20:11:40 +00:00
Robert Speicher fe9a445faa Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master'
Expose User#last_sign_in_at and User#confirmed_at for admins

Closes #840

See merge request !3090
2016-03-08 17:30:10 +00:00
Robert Speicher 24663e8095 Merge branch 'improve/3102-memoize-group-instance-variable-in-admin-groups-controller' into 'master'
Remove instance variable `@group` multiple assignment

See merge request !3127
2016-03-08 17:27:51 +00:00
Robert Speicher c3eb245874 Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master'
Remove duplicate 'cache_store' configuration in test environment

[ci skip]

See merge request !3061
2016-03-08 17:26:47 +00:00
Yorick Peterse 590e1b4b21 Call after_create_branch in Repository#add_branch
This ensures the right caches are flushed when adding a branch via the
UI, instead of only flushing this one random cache.
2016-03-08 18:19:40 +01:00
Yorick Peterse 4ec035b488 Call the right hooks in Repository#add_tag
This ensures Repository#add_tag calls Repository#before_push_tag instead
of just 1 random cache expiration method.
2016-03-08 18:19:40 +01:00
Yorick Peterse 6857b92fab Added specs for Repository#rm_tag 2016-03-08 18:19:40 +01:00
Yorick Peterse 177025b5dd Call the right hooks when removing branches
This ensures that Repository#rm_branch calls
before_remove_branch/after_remove_branch instead of just 1 random cache
expiration method.
2016-03-08 18:19:40 +01:00
Yorick Peterse cb5a5ba095 Cache & flush tag/branch counts
The methods used for this are Repository#tag_count and
Repository#branch_count which cache their output in Redis as well as
memoizing it in an instance variable. Both methods have a corresponding
methods/hooks to flush the caches at the right time.
2016-03-08 18:19:40 +01:00
Robert Speicher f2209c98b2 Merge branch 'sql-guide' into 'master'
Added basic SQL guidelines

This is mostly based on the various changes I've made over the past few months.

See merge request !3091
2016-03-08 17:18:19 +00:00
Achilleas Pipinellis 149a52b10f Merge branch 'patch-1' into 'master'
update slack instructions

the previous instructions no longer apply, there is no "Incoming WebHooks" row anymore.

luckily there exists direct link to web hooks, so the previous steps aren't even neccessary

See merge request !3052
2016-03-08 16:52:20 +00:00
Achilleas Pipinellis c74b609874 Merge branch 'patch-2' into 'master'
add link to web hooks docs

Add link to web hooks docs on custom hooks docs page.

See merge request !3082
2016-03-08 15:54:13 +00:00
Yatish MehtaandRémy Coutable 6ac68d8cb0 Remove instance variable @group multiple assignment 2016-03-08 16:48:00 +01:00
Yorick Peterse 36730e8e63 Merge branch 'master' into 'master'
adds language names to projects list [image attached]

See merge request !3000
2016-03-08 14:52:53 +00:00
Yorick Peterse 059df2256e Added basic SQL guidelines
[ci skip]
2016-03-08 11:28:50 +01:00
Achilleas Pipinellis a19a9faba9 Merge branch 'doc/ci-api-update' into 'master'
Deprecated GitLab CI API clean up

Deprecated GitLab CI API clean up.

The intent here is to clean up deprecated GitLab CI documentation leaving only relevant information.
Since we merged `Ci::Project` to `Project` most of this documentation is outdated.

Closes #13610 

See merge request !3003
2016-03-08 09:35:10 +00:00
Phil Hughes 5b621e1bb5 Snippet visibility badge spacing
Closes #14074
2016-03-08 08:41:01 +00:00
Achilleas Pipinellis 75a67ac0c7 Merge branch 'bundle_clean' into 'master'
add bundle clean to upgrade docs

This MR adds a bundle clean after installing new gems. Bundle clean removes old, not needed gems to keep the system clean.

See merge request !2809
2016-03-08 06:22:23 +00:00
Achilleas Pipinellis 015d7eeae6 Merge branch 'doc-troubleshooting' into 'master'
Added Troubleshooting information for most used services.

This replaces the changes started at gitlab-com/www-gitlab-com!1603

I'd like to add similar troubleshooting information for EE only services, but that needs to happen on a different MR on the EE side. Probably after this one gets merged.

cc @ernstvn @dblessing @balameb @cabargas @kelvinmutuma 

See merge request !3080
2016-03-08 06:14:42 +00:00
Achilleas Pipinellis dc473964e0 Merge branch 'rs-initial-setup-docs' into 'master'
Document changes to the initial admin password

Addresses https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3068#note_4117550

[ci skip]

See merge request !3120
2016-03-08 06:12:50 +00:00