home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,414 Commits 48 Branches 340 Tags
ca823065a905f8c19b2003a67e79831ba1ceff2e
Commit Graph
26414 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Montgomery ca823065a9 actually enable artifacts 2016-04-09 20:51:15 +00:00
Robert Speicher 600b94cd8b Merge branch 'upgrade-sprockets' into 'master' 
Update sprockets to 3.6.0

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

Closes #14344.

See merge request !3544
 2016-04-09 20:32:17 +00:00
Robert Speicher 614402a6ff Merge branch 'schema-remove-twitter-sharing' into 'master' 
Ensure schema version matches latest migration

From commit 85cc172959

See merge request !3627
 2016-04-09 20:07:23 +00:00
connorshea fb8afae186 Apparently I missed updating the schema.rb when removing the Twitter "Congrats" button 
From commit 85cc172959
 2016-04-09 11:28:47 -06:00
connorshea 1647e3e884 Upgrade Sprockets from 3.3.5 to 3.6.0. 
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.
 2016-04-09 08:29:57 -06:00
Robert Speicher cedcc1453c Minor Testing guide copyedits 
[ci skip]
 2016-04-09 01:19:21 -04:00
Robert Speicher 955d027d17 Merge branch 'rs-update-rails' into 'master' 
Bump rails to 4.2.6

See merge request !3424
 2016-04-09 04:07:48 +00:00
Robert Speicher 9e2032173c Merge branch 'efficient-emoji-loading' into 'master' 
Only load emoji spritesheet when necessary

On a normal issue where the only award emoji displayed by default are
the thumbs-up and thumbs-down emoji, this decreases the page load by
670KB or 250KB depending on pixel density.

Resolves #14334.

See merge request !3449
 2016-04-09 00:17:12 +00:00
connorshea 3a196317ab Add "sprite" parameter to emoji_icon helper 
The emoji_icon helper used to display the award emoji in Issue and
Merge Request views. By default the spritesheet is used, but passing
`sprite: false` to the `emoji_icon` helper makes the emoji render as
separate images.

For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and
any that have been awarded to the issue/MR) the independent images are
used. Only when the full emoji menu is opened does the full spritesheet
load.

On a normal issue this change decreases the page load by 670KB or 250KB
depending on pixel density.

Resolves #14334.
 2016-04-08 17:38:31 -06:00
Robert Speicher 17a7419d90 Merge branch 'fix-oxford-comma' into 'master' 
Add a missing Oxford comma in some text on the Activity graph.

Resolves #14668. [ci skip]

See merge request !3625
 2016-04-08 22:35:07 +00:00
Robert Speicher 93571c4335 Merge branch 'redis-connection-pool' into 'master' 
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
 2016-04-08 22:26:53 +00:00
Yorick Peterse 833808d737 Merge branch 'instrument-rails-cache' into 'master' 
Instrument Rails cache code

See merge request !3619
 2016-04-08 20:52:21 +00:00
Yorick Peterse 5ef170ae82 Merge branch 'update-gitlab-shell' into 'master' 
Update gitlab-shell to 2.7.2

See merge request !3594
 2016-04-08 19:35:21 +00:00
connorshea 6a0f839941 Add a missing Oxford comma in some text on the Activity graph. 
Resolves #14668. [ci skip]
 2016-04-08 13:32:17 -06:00
Jacob Schatz 0d216c194c Merge branch '15078-todo-row' into 'master' 
Use meta key to open todo in new tab

Fixes #15078 

See merge request !3623
 2016-04-08 18:38:49 +00:00
Dmitriy Zaporozhets 4a1fdc78a4 Merge branch 'remove-todo' into 'master' 
Remove TODO for not documented stuff

We should not put a `TODO` in a released product.

See merge request !3553
 2016-04-08 17:42:53 +00:00
Dmitriy Zaporozhets 0396c8525c Merge branch 'rs-testing-guide' into 'master' 
First pass at a Testing styleguide

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

[ci skip]

See merge request !3465
 2016-04-08 17:34:55 +00:00
Annabel Dunstone f9014e4ec6 Use meta key to open todo in new tab 2016-04-08 09:46:32 -07:00
Yorick Peterse 940b27ecc1 Merge branch 'metrics-timestamp-precision' into 'master' 
Use more accurate timestamps for InfluxDB.

See merge request !3617
 2016-04-08 15:58:11 +00:00
Yorick Peterse c56f702ec3 Instrument Rails cache code 
This allows us to track how much time of a transaction is spent in
dealing with cached data.
 2016-04-08 17:54:52 +02:00
Yorick Peterse fb02c96747 Merge branch 'gitlab-workhorse-0.7.2' into 'master' 
Use gitlab-workhorse 0.7.2

See merge request !3570
 2016-04-08 15:14:05 +00:00
Yorick Peterse aa7cddc4fc Use more accurate timestamps for InfluxDB. 
This changes the timestamp of metrics to be more accurate/unique by
using Time#to_f combined with a small random jitter value. This
combination hopefully reduces the amount of collisions, though there's
no way to fully prevent any from occurring.

Fixes gitlab-com/operations#175
 2016-04-08 16:39:44 +02:00
Rémy Coutable 312a09e7aa Merge branch 'api-expose-subscribed' into 'master' 
API: Expose subscribed? on issues and merge requests

This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests.

Related to #6024

See merge request !3611
 2016-04-08 14:36:54 +00:00
Robert Schilling fb2fde9d62 API: Expose subscribed? on issues 2016-04-08 15:53:04 +02:00
Robert Schilling 4d04e91814 Merge branch 'patch-1' into 'master' 
Fix Incorrect Quote In Docker Executor Example

## What does this MR do?
The corrected line opened with a regular quote (') but closed with a back-tick (`)  
I believe this is invalid bash syntax

## Are there points in the code the reviewer needs to double check?
Probably not

## Why was this MR needed?
Fixes error when example is copied and pasted

## What are the relevant issue numbers?
None

## Screenshots (if relevant)
None

See merge request !3604
 2016-04-08 13:40:24 +00:00
Jacob Schatz 8419f355d6 Merge branch 'revert-missing-changelog' into 'master' 
Remove changelog entry for new navigation sidebar.



See merge request !3608
 2016-04-07 22:05:42 +00:00
Jacob Schatz 6dbc5f9f33 Merge branch 'code-wrapping' into 'master' 
Fix side-by-side code format & commit message wrap

![Screen_Shot_2016-04-07_at_1.31.28_PM](/uploads/bad00284e4dfbec1fdd75220c34f4a98/Screen_Shot_2016-04-07_at_1.31.28_PM.png)

![Screen_Shot_2016-04-07_at_1.32.23_PM](/uploads/7cd344765025e93d0035934a473b4bb3/Screen_Shot_2016-04-07_at_1.32.23_PM.png)

See merge request !3605
 2016-04-07 22:00:54 +00:00
Jacob Schatz 8f0846d749 Merge branch 'revert-2ed6cd9e' into 'master' 
Revert "Merge branch 'new-navigation-prototype' into 'master'"

This reverts merge request !3494

See merge request !3607
 2016-04-07 21:55:09 +00:00
Robert Speicher 17fe62e3a3 Update CHANGELOG for 8.6.5, 8.5.10, 8.4.8, and 8.3.7 
[ci skip]
 2016-04-07 17:45:36 -04:00
Jacob Schatz ff1903b77a Remove changelog entry for new navigation sidebar. 2016-04-07 17:25:19 -04:00
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'" 
This reverts merge request !3494
 2016-04-07 21:20:16 +00:00
Jacob Schatz 4361cc395c Merge branch 'revert-5e8740ee' into 'master' 
Revert "Merge branch 'fix-sidebar-exapnd' into 'master'"

This reverts merge request !3520

See merge request !3606
 2016-04-07 21:03:28 +00:00
Jacob Schatz dc3de6e132 Revert "Merge branch 'fix-sidebar-exapnd' into 'master'" 
This reverts merge request !3520
 2016-04-07 20:33:01 +00:00
Annabel Dunstone 422a924758 Fix side-by-side code format & commit message wrap 2016-04-07 13:27:39 -07:00
Alex Mayer 875646a85e Fix Incorrect Quote In Docker Executor Example 2016-04-07 20:10:29 +00:00
Jacob Schatz 1060467bb8 Merge branch 'indentation-bug' into 'master' 
Preserve white space



See merge request !3602
 2016-04-07 18:28:48 +00:00
Jacob Schatz f79d3cda35 Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master' 
Update number of Todos in the sidebar when it's marked as "Done"

Closes #15002 

See merge request !3600
 2016-04-07 17:44:41 +00:00
Douglas Barbosa Alexandre ee62ce65a1 Update CHANGELOG 2016-04-07 14:07:13 -03:00
Annabel Dunstone a81fcf8bd6 Indentation update 2016-04-07 09:06:46 -07:00
Annabel Dunstone f84d9e5389 Preserve white space 2016-04-07 08:55:16 -07:00
Douglas Barbosa Alexandre bb5bc90ab0 Update number of Todos in the sidebar when it's marked as "Done" 2016-04-07 12:35:25 -03:00
Rémy Coutable 074c239390 Merge branch 'issue_14012' into 'master' 
Fix problem when creating milestones in groups without projects

Fixes #14012 

See merge request !3481
 2016-04-07 15:19:56 +00:00
Yorick Peterse 37c62252db Update gitlab-shell to 2.7.2 2016-04-07 16:40:51 +02:00
Douwe Maan 9cae14037a Merge branch 'regex-for-colons' into 'master' 
Add optional colon.



See merge request !3591
 2016-04-07 14:40:18 +00:00
Yorick Peterse 45e0565f98 Merge branch 'no-gc-auto' into 'master' 
Disable git gc --auto

See merge request !3572
 2016-04-07 14:29:42 +00:00
Rémy Coutable e8e9471c61 Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' 
Hide "assign to me" link if not allowed

Fixes #14996

See merge request !3590
 2016-04-07 14:02:30 +00:00
Felipe Artur 0bef4b9764 Implement review suggestions 2016-04-07 10:59:24 -03:00
Jacob Vosmaer cf669551f6 Put CACHE_NAMESPACE in the Gitlab::Redis module 2016-04-07 15:42:07 +02:00
Jacob Schatz 2caaabf10a CHANGELOG 2016-04-07 09:14:20 -04:00
Jacob Schatz 0bbeebc8f9 Remove dumb debug statement and add many tests. 2016-04-07 08:47:29 -04:00