Commit Graph
25011 Commits
Author SHA1 Message Date
Stan Hu 380a67ad4c Ensure PATH_INFO exists for go-get 2016-03-12 08:10:54 -08:00
Stan Hu b23a05d09b Add spec for go-import middleware 2016-03-12 08:10:38 -08:00
Stan Hu bb206f947f Simplify code 2016-03-12 07:50:02 -08:00
Stan Hu 2563213ccf Remove existing go_import.html.haml implementation 2016-03-12 07:49:16 -08:00
Stan Hu cc065fbeaa Support Golang subpackage fetching
Closes #13805
2016-03-12 01:09:37 -08:00
Robert Speicher f7da99aef7 Merge branch 'webhooks' into 'master'
Change all instances of "web hooks" to "webhooks"

See merge request !3169
2016-03-10 23:09:52 +00:00
Rémy Coutable e0b6ad8d61 Add 8.5.5 CHANGELOG items
[ci skip]
2016-03-10 21:59:52 +01:00
Robert Speicher 444c6295ba Fix help_autocomplete alignment
OCD hooooooooo!

[ci skip]
2016-03-10 15:24:37 -05:00
Jacob Schatz 2d83f07ba8 Merge branch 'issue_13987' into 'master'
Fixes broken layout of web editor page on mobile

Fixes #13987 

<p><img src="https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a58e7b576c25d5929bc1cdcbe163161/Screen_Shot_2016-03-10_at_1.13.19_PM.png" alt="Screen_Shot_2016-03-10_at_1.13.19_PM" width="487"></p>

See merge request !3167
2016-03-10 20:13:32 +00:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
Alfredo Sumaran bfcf6a045c Use full URL to reference issues 2016-03-10 14:31:21 -05:00
Robert Speicher b886d833d3 Merge branch 'markdown-parser-documentation' into 'master'
Adds mention of Redcarpet as Markdown parser in docs

It makes it easier for users to find the source of issues related to
Markdown parsing.

[ci skip]

See merge request !3168
2016-03-10 19:25:31 +00:00
A. Felipe Cabargas Madrid b04020506d Capitalize Rouge mentions 2016-03-10 16:12:50 -03:00
A. Felipe Cabargas Madrid 43a4762d50 Capitalize names of technologies 2016-03-10 16:11:59 -03:00
A. Felipe Cabargas Madrid c548795084 Added redcarpet usage reference to markdown documentation 2016-03-10 16:01:58 -03:00
Robert Speicher 5c1dba671d Merge branch 'issue-mr-build-status-placement' into 'master'
Moves build status tooltip on issues

See merge request !3156
2016-03-10 18:52:33 +00:00
Jacob Schatz e1f9f69cb2 Merge branch 'slang/gitlab-ce-rewrite-logo' into 'master'
rewrite logo to simplify SVG code

_Originally opened at !3129 by @slang._

- - -

The look of the logo is obviously unchanged... This just gets rid of some useless SVG groups that Sketch made.

See merge request !3164
2016-03-10 18:50:07 +00:00
Douwe Maan 57142014e8 Merge branch 'expiring-lock' into 'master'
Use an exclusive lease for LDAP checks

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

Merge https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3140 first.

Only perform LDAP checks for a user after acquiring a lease. Checks
during user login do not require a lease.

The lease has a fixed expire time of 10 minutes.

See merge request !3143
2016-03-10 18:30:28 +00:00
Alfredo Sumaran 3a156eb73d Prevent .max-width-marker to break layout on mobile 2016-03-10 13:14:10 -05:00
Alfredo Sumaran 4dd1d6c401 Avoid blinking of editor area on iOS 2016-03-10 13:10:40 -05:00
Phil Hughes 145143ac7f Changed named argument
Set position to auto left so that if it is off-screen it goes to the right
2016-03-10 18:05:55 +00:00
Jacob Vosmaer 7b2bf4ce75 Typo 2016-03-10 18:41:57 +01:00
Jacob Vosmaer 6bfff2fab2 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expiring-lock 2016-03-10 18:40:58 +01:00
Douwe Maan 8ecdc0a7de Merge branch 'fix-filtered-pagination' into 'master'
Allow filtered explore results to be paged. Fixes #14104



See merge request !3149
2016-03-10 17:40:15 +00:00
Phil Hughes bc19acab25 Correct ruby code 2016-03-10 17:39:53 +00:00
Jacob Vosmaer 261214efc2 Make comment less ambivalent 2016-03-10 18:39:50 +01:00
Douwe Maan 34bbd7109c Merge branch 'redis-config-parser' into 'master'
Parse config/resque.yml in one place only



See merge request !3140
2016-03-10 17:27:08 +00:00
Sean LangandRémy Coutable e6ce1206e5 rewrite logo to simplify SVG code 2016-03-10 18:14:11 +01:00
Jacob Schatz 26541240dc Merge branch 'issue_14011' into 'master'
Set color text to blue for links inside gray areas

Closes #14011 

![](/uploads/4bce32cf7be4414f947a97cf266f7b0d/Screen_Shot_2016-03-09_at_6.53.12_PM.png)

See merge request !3147
2016-03-10 17:08:52 +00:00
Jacob Schatz e080028570 Merge branch 'dropdown-js' into 'master'
Dropdown JS



See merge request !3112
2016-03-10 16:24:32 +00:00
Jacob Vosmaer f4d478a6a8 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expiring-lock 2016-03-10 17:07:27 +01:00
Jacob Vosmaer 3729c0822a Remove unnecessary random key 2016-03-10 17:05:36 +01:00
Jacob Schatz 3d4063efa1 Merge branch 'download-button-flicker' into 'master'
Fixed flicker of download project button

Closes #14177

![download-button-flicker](/uploads/21e8ccc68ed66394c8ec65ca549f94ad/download-button-flicker.gif)

See merge request !3152
2016-03-10 15:20:17 +00:00
Jacob Schatz 8179f4fc0c Merge branch 'roperzh/gitlab-ce-issue-13334' into 'master'
Decrease the font size and the padding of the `.anchor` icons used in the README

_Originally opened at !2819 by @roperzh._

- - -

## What does this MR do?

Removes an overlap between the anchor icons on the readme and the sidebar on small screens by reducing the size and the padding of the icon.

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

Probably someone in the Design / UX team will need to review if the solution makes sense.

## What are the relevant issue numbers?

Issue #13334

## Screenshots

![Screen_Shot_2016-02-15_at_3.35.13_PM](/uploads/0e8b215809eee8efec9b6a136b0bd841/Screen_Shot_2016-02-15_at_3.35.13_PM.png)

See merge request !3150
2016-03-10 15:18:37 +00:00
Douwe Maan 38823e3e83 Merge branch 'optimize-project-ci-services' into 'master'
Optimize Project#ci_service(s)

Related issue: gitlab-org/gitlab-ce#14186

See merge request !3158
2016-03-10 15:08:21 +00:00
Jacob Schatz a1f4531069 Merge branch 'quick-submit-note-edit' into 'master'
Fixed quick submit on note edit

Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094

See merge request !3151
2016-03-10 14:34:03 +00:00
Yorick Peterse f2992cf343 Optimize Project#ci_service(s)
The method Project#ci_services would load all services into memory
(including _all_ their columns) and then use Enumerable#select to reduce
the list. Project#ci_service in turn would further reduce this list down
to just 1 Service instance.

Instead of doing all this in Ruby we can just offload the work to the
database, reducing the amount of time spent in these methods. These
changes reduce the time of the first call to Project#ci_services from
around 240 ms to around 10 ms, though the final timings will vary based
on database load. Because Project#ci_service is memoized there's no
further overhead introduced by using a database query.

Fixes gitlab-org/gitlab-ce#14186
2016-03-10 15:32:31 +01:00
Jacob Schatz b9c9948ff8 Merge branch 'copy-markdown-snippet' into 'master'
Fixes issue with markdown snippet not being copyable

On markdown snippets this adds a hidden div with the raw markdown content so that it can be copied

Closes #13882

See merge request !3153
2016-03-10 14:20:48 +00:00
Phil Hughes ee9a6d7fb3 Fixed failing milestone filter tests 2016-03-10 13:54:54 +00:00
Phil Hughes 8d7e0f0ba9 Fixed failing tests 2016-03-10 13:54:54 +00:00
Phil Hughes a9ea06ed29 Fixed ruby style errors 2016-03-10 13:54:54 +00:00
Phil Hughes f3afcb87b7 Correctly handles multi-selected values
Fixes an issue where values couldnlt be unselected
2016-03-10 13:54:54 +00:00
Phil Hughes 6c89196278 Enter button trigger first row click when searching 2016-03-10 13:54:54 +00:00
Phil Hughes 57294f3043 Removed fuse for fuzzaldrin 2016-03-10 13:54:54 +00:00
Phil Hughes 0e82bcad8a Fixed issue with user list not fetching current project users 2016-03-10 13:54:54 +00:00
Phil Hughes 7744b67f75 Stops excute remote data fetcher when already recieved data 2016-03-10 13:54:54 +00:00
Phil Hughes dd35de1ad8 Uses a publicly facing URL so that it allows labels & milestones to be visible when not logged in 2016-03-10 13:54:54 +00:00
Phil Hughes 730af55268 Filter alignment 2016-03-10 13:54:54 +00:00
Phil Hughes 2e3c082f2a Status dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 75b21ebd75 Can create new label from dropdown 2016-03-10 13:54:54 +00:00