Commit Graph
22485 Commits
Author SHA1 Message Date
Stan Hu cd243b83fc Merge pull request #9968 from vimalloc/patch-1
Mention channel/key bug in irkerd docs
2016-01-12 18:48:49 -08:00
Robert Speicher 1813adcdea Merge branch 'rs-prepare-rc1' into 'master'
Prepare Installation and Update docs for 8.4 RC1

[ci skip]

See merge request !2401
2016-01-12 23:13:24 +00:00
Robert Speicher 3dfb69a59f Prepare Installation and Update docs for 8.4 RC1
[ci skip]
2016-01-12 18:04:02 -05:00
Landon 4819de1e70 Mention channel/key bug in irkerd docs
Per this issue: https://gitlab.com/esr/irker/issues/2

A documentation update was added to irkerd (https://gitlab.com/esr/irker/commit/190808c37d4ab5f0f16fe35352ff36863c2732d5) but the bug is still there. Making a note of it here could save someone a lot of hassle. 

This could probably be worded better if someone else wants to take a stab at it.
2016-01-12 15:54:09 -07:00
Robert Speicher 8c67a9fb36 Merge branch 'rs-revert-remove-filters' into 'master'
Revert "Remove the `:coffee` and `:coffeescript` Haml filters"

This reverts commit ae7de2f851.

Several files in EE still use the `:coffeescript` filter and
I don't have time to fix them before the CE-to-EE merge.

See https://gitlab.com/gitlab-org/gitlab-ee/builds/553647

I will reintroduce this change in a future MR.

See merge request !2400
2016-01-12 22:26:38 +00:00
Robert Speicher b0145d765b Revert "Remove the :coffee and :coffeescript Haml filters"
This reverts commit ae7de2f851.
2016-01-12 16:30:38 -05:00
Dmitriy Zaporozhets 5c874f06fc Merge branch 'change_milestone_close_copy' into 'master'
Change milestone close notice copy. Closes #6051



See merge request !2372
2016-01-12 17:42:45 +00:00
Jacob Schatz f225c2a005 Merge branch 'improve_more_buttons' into 'master'
Improve admin area button style

A lot of the buttons in the top right in the admin area were too big. This makes those the new `btn-nr` size which seems to look nice.

## User buttons

### Current

![Screen_Shot_2016-01-08_at_2.29.30_PM](/uploads/8920d4a67ff4a20617e5b4d319ba154e/Screen_Shot_2016-01-08_at_2.29.30_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.29.21_PM](/uploads/494741f6e92592ff2c60683f399bb1c1/Screen_Shot_2016-01-08_at_2.29.21_PM.png)

## Project edit button

### Current

![Screen_Shot_2016-01-08_at_2.29.59_PM](/uploads/09a2f8fddc45120510dd10758ce33c51/Screen_Shot_2016-01-08_at_2.29.59_PM.png)

### New ![Screen_Shot_2016-01-08_at_2.30.14_PM](/uploads/93a72a7c42b1974643b1e9ffd3ec8511/Screen_Shot_2016-01-08_at_2.30.14_PM.png)

## Label button

### Current

![Screen_Shot_2016-01-08_at_2.38.09_PM](/uploads/9cff790e1a4e2d650487c9765d0235a4/Screen_Shot_2016-01-08_at_2.38.09_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.38.31_PM](/uploads/9462ff2393249eb762dc7cb92605c733/Screen_Shot_2016-01-08_at_2.38.31_PM.png)

cc/ @jschatz1 @creamzy @skyruler 

See merge request !2351
2016-01-12 17:36:01 +00:00
Robert Speicher d047db910a Merge branch 'changelog-8.3.4' into 'master'
Add CHANGELOG entry for 8.3.4

[ci skip]

See merge request !2393
2016-01-12 17:18:00 +00:00
Robert Speicher 025f061765 Merge branch 'gitlab-omnibus-really' into 'master'
Never heard of gitlab-omnibus

See merge request !2388
2016-01-12 16:59:10 +00:00
Jacob Vosmaer 1c46ab040d Add CHANGELOG entry for 8.3.4 2016-01-12 17:10:07 +01:00
Jacob Vosmaer 9cbdc2d860 Merge branch 'gitlab-workhorse-0.5.4' into 'master'
Use gitlab-workhorse 0.5.4

Fixes routing errors for /api/v3/projects/

See merge request !2391
2016-01-12 15:55:11 +00:00
Yorick Peterse 83ad5fa5cb Merge branch 'remove-application-frames-from-views' into 'master'
See merge request !2392
2016-01-12 15:44:57 +00:00
Achilleas Pipinellis 8f1c46d18a Merge branch 'add_make' into 'master'
added make command to docs

The gitlab-workhose update docs are missing a make command

See merge request !2281
2016-01-12 15:22:54 +00:00
Yorick Peterse 6992b07245 Merge branch 'allocated-memory-per-transaction' into 'master'
See merge request !2389
2016-01-12 14:45:23 +00:00
Yorick Peterse 355c341fe7 Stop tracking call stacks for instrumented views
Where a vew is called from doesn't matter as much. We already know what
action they belong to and this is more than enough information. By
removing the file/line number from the list of tags we should also be
able to reduce the number of series stored in InfluxDB.
2016-01-12 15:41:22 +01:00
Jacob Vosmaer 0e769d2a48 Use gitlab-workhorse 0.5.4
Fixes routing errors for /api/v3/projects/
2016-01-12 15:18:17 +01:00
Yorick Peterse 5679ee0120 Track memory allocated during a transaction
This gives a very rough estimate of how much memory is allocated during
a transaction. This only works reliably when using a single-threaded
application server and a Ruby implementation with a GIL as otherwise
memory allocated by other threads might skew the statistics. Sadly
there's no way around this as Ruby doesn't provide a reliable way of
gathering accurate object sizes upon allocation on a per-thread basis.
2016-01-12 14:59:30 +01:00
Jacob Vosmaer fac252c9a2 Never heard of gitlab-omnibus 2016-01-12 14:47:55 +01:00
Josh Frye 0c598004d7 Revert group milestone copy 2016-01-12 08:29:47 -05:00
Dmitriy Zaporozhets e85faec90e Merge branch 'show-ip-addresses' into 'master'
Add user's last used IP addresses to admin page

This would help admins figure out from where spam is originating.

Screenshot:

![image](/uploads/984005a3a35b7004bd0a363081eb53ba/image.png)


See merge request !2381
2016-01-12 11:44:40 +00:00
Dmitriy Zaporozhets c304988306 Merge branch 'improve_button_styles' into 'master'
Improve button styles

I noticed a couple of buttons don't match the newer styles.

## Issue edit note form

### Current (cancel button is big)

![Screen_Shot_2016-01-08_at_2.18.29_PM](/uploads/c7928e6644e886090f55cb61076c9e89/Screen_Shot_2016-01-08_at_2.18.29_PM.png)

### Now

![Screen_Shot_2016-01-08_at_2.18.22_PM](/uploads/d15c3c458a08ce5a59c367c7fb379c31/Screen_Shot_2016-01-08_at_2.18.22_PM.png)

## Merge request code discussion

### Current

![Screen_Shot_2016-01-08_at_2.21.37_PM](/uploads/b970ff3e5d9ef5e62f83bb56d5505f8d/Screen_Shot_2016-01-08_at_2.21.37_PM.png)

### Now (Also changed to `btn-save` class which changes to green. This matches everything else)

![Screen_Shot_2016-01-08_at_2.22.01_PM](/uploads/ed520de72177de92efe21d236bb04d24/Screen_Shot_2016-01-08_at_2.22.01_PM.png)

cc/ @jschatz1 @skyruler @creamzy 

See merge request !2350
2016-01-12 11:41:00 +00:00
Yorick Peterse 587f850170 Merge branch 'changelog-metrics' into 'master'
See merge request !2385
2016-01-12 10:37:54 +00:00
Yorick Peterse 9f8510b329 Updated CHANGELOG with changes I made
I forgot to add these in the respective MRs.

[ci skip]
2016-01-12 11:36:59 +01:00
Stan Hu 75123458ee Add user's last used IP addresses to admin page
This would help admins figure out from where spam is originating.
2016-01-12 00:59:29 -08:00
Dmitriy Zaporozhets c4511a1234 Merge branch 'update-fog' into 'master'
Bump fog to 1.36.0

Updates AWS regions and fixes a number of bugs. Tested a GitLab AWS backup without any issues.

Closes #4231

See merge request !2373
2016-01-12 08:57:08 +00:00
Dmitriy Zaporozhets af7f0a4df4 Merge branch 'hover-descriptions' into 'master'
adds hover titles to merge request and issue pages

Fixes #5899

See merge request !2375
2016-01-12 08:55:40 +00:00
Dmitriy Zaporozhets 93a8c98155 Merge branch 'active-state-on-button-makes-it-uppercase' into 'master'
changes bolded on active for dropdowns, sitewide.

Fixes #6056 <br/>
 **Note:** this change applies to all dropdowns. Currently all dropdowns using bootstrap's dropdown.js apply a bold and larger font for an active state.

See merge request !2377
2016-01-12 08:53:22 +00:00
Dmitriy Zaporozhets f0450c486c Merge branch 'rs-add-title-to-emoji' into 'master'
Add title attribute to Emojis in award picker



See merge request !2378
2016-01-12 08:52:28 +00:00
Dmitriy Zaporozhets 7929fe0598 Merge branch 'rs-remove-coffee-filters' into 'master'
Remove the `:coffee` and `:coffeescript` Haml filters

See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897

See merge request !2380
2016-01-12 08:51:23 +00:00
Robert Speicher ae7de2f851 Remove the :coffee and :coffeescript Haml filters
See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897
2016-01-11 21:48:20 -05:00
Robert Schilling 3ea637ed5d Merge branch 'typo-fix' into 'master'
[ci skip] Fixed minor typo in docker documentation

This change is self-explanatory.

See merge request !2374
2016-01-12 01:24:00 +00:00
Robert Speicher 68d0076415 Merge branch 'rs-clear-current-timer' into 'master'
Call clearInterval for the currentTimer if one exists

Prevents a double-click from causing the logo to sweep forever after a
load completes.

See merge request !2379
2016-01-11 23:56:43 +00:00
Robert Speicher d4ffe705eb Call clearInterval for the currentTimer if one exists
Prevents a double-click from causing the logo to sweep forever after a
load completes.
2016-01-11 18:37:20 -05:00
Robert Speicher 21a46236e0 Add title attribute to Emojis in award picker 2016-01-11 18:15:38 -05:00
Jacob Schatz 9bea7efb73 changes bolded on active for dropdowns, sitewide. 2016-01-11 16:04:31 -05:00
Robert Speicher f2fab27a56 Update CHANGELOG
[ci skip]
2016-01-11 15:18:07 -05:00
Robert Speicher 6fc1aba4a3 Merge branch 'fix/ci-linter-sequence-validations' into 'master'
Allow subsequent validations in CI Linter

Closes #5851

See merge request !2368
2016-01-11 19:09:09 +00:00
Robert Speicher 5dad714df6 Merge branch 'fix-ci-builds-for-tags' into 'master'
Generate builds when creating tag using web interface

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4296

See merge request !2366
2016-01-11 17:53:06 +00:00
Jacob Schatz b3431a8ce8 adds hover titles to merge request and issue pages 2016-01-11 12:50:01 -05:00
Robert Speicher 5d63ad21a6 Merge branch 'gitlab-workhorse-0.5.3' into 'master'
Use gitlab-workhorse 0.5.3

See merge request !2367
2016-01-11 17:43:35 +00:00
Douwe Maan 49f51ff164 Merge branch 'optimize_ldap' into 'master'
Optimize LDAP and add a search timeout

Related to #4282 

This merge request arranges some things in `access.rb` to facilitate some optimizations in EE (to come later). It also adds a 10 second timeout to all LDAP searches so the entire worker is not blocked if some query doesn't return in a reasonable amount of time. This timeout is configurable per LDAP server.

See merge request !2267
2016-01-11 17:32:33 +00:00
Yorick Peterse d65e7aa9c8 Merge branch 'add-action-to-all-metrics' into 'master'
See merge request !2370
2016-01-11 17:04:34 +00:00
John Galt 0f113828fa [ci skip] Fixed minor typo in docker documentation 2016-01-11 10:02:39 -07:00
Stan Hu e34c621ea1 Bump fog to 1.36.0
Closes #4231
2016-01-11 08:41:11 -08:00
Josh Frye 75180eae1c Change milestone close notice copy. Closes #6051 2016-01-11 11:28:12 -05:00
Yorick Peterse 35b501f30a Tag all transaction metrics with an "action" tag
Without this it's impossible to find out what methods/views/queries are
executed by a certain controller or Sidekiq worker. While this will
increase the total number of series it should stay within reasonable
limits due to the amount of "actions" being small enough.
2016-01-11 16:51:01 +01:00
Dmitriy Zaporozhets 701e9ee451 Merge branch 'rs-omniauth-client-versions' into 'master'
Add versions to omniauth_crowd and omniauth-azure-oauth2

Also sorts them alphabetically, because OCD.

See merge request !2364
2016-01-11 15:32:39 +00:00
Dmitriy Zaporozhets 5500f9159f Merge branch 'group-issues-sorting' into 'master'
Improve performance of getting issues on group level

For testing I used the URL http://localhost:3000/groups/gitlab-org/issues?milestone_title=8.1. Prior to these changes said URL would take about 10-12 seconds to load. By applying these changes the loading time has been reduced to roughly 2-3 seconds. 

There's still some stuff going on in some views that I have to look at, resolving those changes might reduce the loading time a bit more. I also still have to check if I didn't break too many tests.

Fixes: gitlab-org/gitlab-ce#3707 gitlab-org/gitlab-ce#4071 

See merge request !2318
2016-01-11 15:28:41 +00:00
Drew Blessing 97022c414e Improve admin area button style 2016-01-11 09:11:40 -06:00