delta/gitlab/gitlab-ce.git/Gemfile, branch parallel-diff-alignment gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'license-templates-and-api-12804' into 'master' 2016-04-20T01:38:49+00:00 Robert Speicher robert@gitlab.com 2016-04-20T01:38:49+00:00 3d4875f86a3b23789f5ea801c096754fced25166 License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660 

License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 Update octokit gem to version 4.3.0 2016-04-18T20:02:40+00:00 Douglas Barbosa Alexandre dbalexandre@gmail.com 2016-04-17T15:32:31+00:00 5f39729c19fa22836686dab32fbcf7c34f32fd41 






Update to licensee 8.0.0 and fix API specs
2016-04-18T12:47:50+00:00

Rémy Coutable
remy@rymai.me

2016-04-13T13:56:37+00:00

2f18c77e1b0e3b6f3d668c3cb1814d4675641a75

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Initial implementation if license template selector and /licenses/:key API endpoint
2016-04-18T12:47:50+00:00

Anton Davydov
antondavydov.o@gmail.com

2016-03-01T12:36:50+00:00

073c3d15c71a0f877b62c7d3d7417a9721da1dba












Update spring and spring-commands-spinach
2016-04-12T18:28:07+00:00

Robert Speicher
rspeicher@gmail.com

2016-04-12T18:28:07+00:00

42a391f744a2ea43272483f998395c910153e1d2

Spring changelog: https://git.io/vVAUY





Spring changelog: https://git.io/vVAUY







Upgrade annotate from 2.6.10 to 2.7.0
2016-04-10T21:14:57+00:00

connorshea
connor.james.shea@gmail.com

2016-04-10T21:14:57+00:00

a7e1638b430627133a33986b8a8283891431567a

Includes compatibility with Rails 5. We don’t have any tests for this,
so no need to run them. [ci skip]

Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0

Working towards #14286.





Includes compatibility with Rails 5. We don’t have any tests for this,
so no need to run them. [ci skip]

Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0

Working towards #14286.







Upgrade Sprockets from 3.3.5 to 3.6.0.
2016-04-09T14:29:57+00:00

connorshea
connor.james.shea@gmail.com

2016-04-09T14:29:57+00:00

1647e3e8849991629f5ebf1a11f9ca06e8f741ea

Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md

Resolves #14344.





Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md

Resolves #14344.







Merge branch 'rs-update-rails' into 'master'

2016-04-09T04:07:48+00:00

Robert Speicher
robert@gitlab.com

2016-04-09T04:07:48+00:00

955d027d17485924ea7c04228edbade3bc835660


Bump rails to 4.2.6

See merge request !3424





Bump rails to 4.2.6

See merge request !3424






Merge branch 'redis-connection-pool' into 'master'

2016-04-08T22:26:53+00:00

Robert Speicher
robert@gitlab.com

2016-04-08T22:26:53+00:00

93571c433584d7d183c8d0555a4d210d0ae75e16


Redis connection pool

Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

Having an easily accessible Redis connection pool allows us to do more
cool stuff with Redis in GitLab (instead of having to go through e.g.
the Rails cache).

See merge request !3521





Redis connection pool

Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

Having an easily accessible Redis connection pool allows us to do more
cool stuff with Redis in GitLab (instead of having to go through e.g.
the Rails cache).

See merge request !3521






Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2
2016-04-07T05:54:28+00:00

connorshea
connor.james.shea@gmail.com

2016-04-07T05:54:28+00:00

50ef9fcafb671aa1598cb0cf83b30884b35809d4

This removes a few dependencies! It was also rude to be using coveralls
0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also
paves the way for updating mime-types to 3.0.

Coveralls Changelog:
https://github.com/lemurheavy/coveralls-ruby/releases

Simplecov Changelog:
https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md





This removes a few dependencies! It was also rude to be using coveralls
0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also
paves the way for updating mime-types to 3.0.

Coveralls Changelog:
https://github.com/lemurheavy/coveralls-ruby/releases

Simplecov Changelog:
https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md