Commit Graph
22463 Commits
Author SHA1 Message Date
Jacob Schatz eb3e7bdfd8 merge request close message moved and merge request now refered by !. 2016-01-12 08:40:02 -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
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
Dmitriy Zaporozhets 1ede18bfa8 Merge branch 'rs-woff-fonts' into 'master'
Use WOFF versions of SourceSansPro

See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023

See merge request !2357
2016-01-11 14:25:25 +00:00
Drew Blessing 67aa0b8c4c Optimize LDAP and add a search timeout 2016-01-11 08:17:32 -06:00
Dmitriy Zaporozhets a9800ce40b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-01-11 15:04:18 +01:00
Douwe Maan 66dee188d8 Merge branch 'rs-zenmode-cleanup' into 'master'
Refactor ZenMode

- No longer depends on the "hidden checkbox".
- No longer depends on manually storing/restoring the scroll position.
  Instead, we take advantage of jquery.scrollTo.
- Event-based.
- Simplifies the state-based styling.

See merge request !2354
2016-01-11 13:50:30 +00:00
Douwe Maan d89ad5078d Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erb
use JavaScript instead of CoffeeScript in Views for master
2016-01-11 14:31:55 +01:00
Grzegorz Bizon cdd3a80682 Allow subsequent validations in CI Linter
Closes #5851
2016-01-11 13:37:31 +01:00
Dmitriy Zaporozhets f41b535ced Merge branch 'fix-build-status-caching' into 'master'
Fix caching issue where build status was not updating in project dashboard

The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable.

Closes #3268

See merge request !2353
2016-01-11 12:10:33 +00:00
Jacob Vosmaer 13c3562217 Use gitlab-workhorse 0.5.3 2016-01-11 13:05:32 +01:00
Dmitriy Zaporozhets 57a4319d42 Merge branch 'load-autocomplete-when-needed' into 'master'
Only load autocomplete data when actually needed



See merge request !2365
2016-01-11 11:58:45 +00:00
Kamil Trzciński b6c2908cb2 Merge branch 'fix-build-page-typo' into 'master'
Fix typo in build page of projects

The column containing links to the builds is named Runner but actually
contains the Build.

See merge request !2347
2016-01-11 11:54:18 +00:00
Kamil Trzcinski 31b66aa75e Generate builds when creating tag using web interface 2016-01-11 12:37:27 +01:00
Achilleas Pipinellis 5270cc6958 Merge branch 'doc-update' into 'master'
Update docs for shared runner default settings

GitLab 8.2 updated shared runners to default to `ENABLED` on all projects.

Fixes #5993

See merge request !2358
2016-01-11 11:32:10 +00:00
Yorick Peterse 569f5701ee Only load autocomplete data when actually needed
Previously this would result in autocomplete data being loaded for every
page (e.g. the page showing all Git branches of a project).
2016-01-11 11:13:11 +01:00
Dmitriy Zaporozhets ce066ba630 Merge branch 'autocomplete-on-load' into 'master'
Load autocomplete data when loading an issue page



See merge request !2312
2016-01-11 09:42:37 +00:00
Dmitriy Zaporozhets e9f84c4c8c Merge branch 'new-branch-position-fix' into 'master'
fixes new branch button positioning, when visible and not visible container

Fixes #5893
#5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. 

See merge request !2348
2016-01-11 09:41:32 +00:00
Dmitriy Zaporozhets e3c024f712 Merge branch 'add-pencil-icon-to-group-page' into 'master'
Add pencil icon to edit group settings

Move icons to upper-right corner of group page

Before:

![image](/uploads/6694c33eae6e10a4e21efef465a07114/image.png)

After:

![image](/uploads/0c17c2cf89fc0fde4344911b30f2635c/image.png)

Closes #6038

See merge request !2361
2016-01-11 09:40:33 +00:00
Dmitriy Zaporozhets e04e957bd6 Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce 2016-01-11 10:17:27 +01:00
Jeroen Nijhof 17f6a916d0 Merge branch 'master' into 'master'
Added housekeeping for git repositories

This merge request will add a housekeeping button in the project setting page which invoke the gitlab shell to run a `git gc` in the project repository.

see gitlab-org/gitlab-ce#3041

Depends on gitlab-org/gitlab-shell!23 which has been merged.


See merge request !1658
2016-01-11 09:13:53 +00:00
Jeroen Nijhof 706255b926 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-11 09:32:35 +01:00
Stan Hu 1587d57197 Check for current user 2016-01-10 20:46:57 -08:00
Stan Hu f394ccd584 Merge branch 'Issue#5817' into 'master'
Issue#5817 Improve wording of the web hooks page on the project's setting

Merge Request !2362 had  a typo, I'm resubmitting the merge request about issue #5817.

See merge request !2363
2016-01-11 04:28:46 +00:00