home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,503 Commits 48 Branches 340 Tags
2c31ebff889a0bee1ef6c56ff80a56deebc2d67b
Commit Graph
23503 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rubén Dávila 2c31ebff88 Add little spacing between milestone stats. 2016-02-02 17:45:42 -05:00
Rubén Dávila 46b5f83a1b Show labels in Issues tab. 2016-02-02 17:45:42 -05:00
Rubén Dávila e6be134b6c Change style of Delete button. 2016-02-02 17:45:42 -05:00
Rubén Dávila 1162f8d77e Add elpased time. 2016-02-02 17:45:42 -05:00
Rubén Dávila 4e8266e8df Change format of Milestone stats. 2016-02-02 17:45:42 -05:00
Rubén Dávila 365d96ca85 Add labels tab to milestone detail view. 2016-02-02 17:45:42 -05:00
Jacob Schatz c4c919e59d Merge branch 'title-projects-dropdown' into 'master' 
Added dropdown to list all projects on project header

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

When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user.

When closed:

![Screen_Shot_2016-01-14_at_19.17.44](/uploads/a7258ba388dba238fc2f0468711fc729/Screen_Shot_2016-01-14_at_19.17.44.png)

When open:

![Screen_Shot_2016-01-14_at_19.17.51](/uploads/716533d9eb44b123c5fdff36a4740489/Screen_Shot_2016-01-14_at_19.17.51.png)


cc. @jschatz1

See merge request !2438
 2016-02-02 22:15:40 +00:00
Robert Speicher a12ac9c060 Update CHANGELOG 
[ci skip]
 2016-02-02 14:50:14 -05:00
Robert Speicher 44b4c9d060 Merge branch 'patch-1' into 'master' 
Consistent rails_socket use.

[ci skip]

See merge request !2596
 2016-02-02 17:33:37 +00:00
Jacob Vosmaer 752468d55b Merge branch 'git-raw-workhorse' into 'master' 
Send raw Git blobs via gitlab-workhorse



See merge request !2451
 2016-02-02 17:22:04 +00:00
Robert Speicher dc390c5ac2 Merge branch 'patch-1' into 'master' 
explicitly call script with bash for consistency

simpler than telling users to set script executable

[ci skip]

See merge request !2621
 2016-02-02 16:25:37 +00:00
Dmitriy Zaporozhets 5af15baae6 Merge branch 'update-newrelic-gem' into 'master' 
Bump New Relic gem version to avoid warnings in Web page

This version has support for Grape, so we should consider removing
the newrelic-grape gem as well:

https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation

See merge request !2578
 2016-02-02 16:09:32 +00:00
Dmitriy Zaporozhets 30313098a0 Merge branch 'Michi302/gitlab-ce-fix/pagination-links' into 'master' 
Fix add_pagination_headers to keep request parameters in Link header

Originally opened at !2321. Closes #5904. /cc @Michi302

See merge request !2674
 2016-02-02 16:04:08 +00:00
Robert Speicher b77cc8a133 Merge branch 'contributing-labels-stable-releases' into 'master' 
Updated contributing guide for stable releases

[ci skip]

See merge request !2638
 2016-02-02 15:53:58 +00:00
Jacob Vosmaer 5372641538 Merge branch 'lazy-blobs' into 'master' 
Lazy Git blobs

To prevent madness like loading a 100MB file into Ruby's memory just
to decide whether it is binary or text.

See merge request !2663
 2016-02-02 15:02:17 +00:00
Jacob Vosmaer ea41d36077 Use gitlab-workhorse 0.6.3 in installation guide 2016-02-02 16:01:20 +01:00
Jacob Vosmaer d716905743 Use gitlab-workhorse 0.6.3 2016-02-02 16:00:13 +01:00
Rémy Coutable 070a3079fc Add a spec for the API pagination Link header 2016-02-02 15:26:29 +01:00
Michi302andRémy Coutable c41a8be8d2 Fix add_pagination_headers to keep request parameters in Link header 2016-02-02 15:26:29 +01:00
Jacob Vosmaer 15a1acb479 Merge remote-tracking branch 'origin/master' into git-raw-workhorse 2016-02-02 15:06:19 +01:00
Jacob Vosmaer b67f8eee0d Use @repository 2016-02-02 15:06:14 +01:00
Jacob Vosmaer d3affe8bca Merge remote-tracking branch 'origin/master' into lazy-blobs 2016-02-02 15:04:54 +01:00
Jacob Vosmaer e08aa3df90 Use gitlab_git 8.0.0 2016-02-02 15:04:50 +01:00
Jacob Vosmaer 0a4db90d36 Use begin/end instead of defined? 2016-02-02 14:35:09 +01:00
Jacob Vosmaer c76e6b982b Move load command into _text partial 2016-02-02 14:17:08 +01:00
Douwe Maan 6cffcb0588 Merge branch 'allow-@' into 'master' 
Allow "@" in file names and path

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

See merge request !2665
 2016-02-02 12:30:57 +00:00
Douwe Maan 680d66db9e Merge branch 'generate-valid-message-id-for-email-rejections' into 'master' 
Generate valid (RFC 2111) Message-ID in email rejection mailer

Use a Message-ID that is RFC 2111 compliant. This fix is consistent with
how the Message-ID is generated in the 'notify' mailer.

See merge request !2656
 2016-02-02 12:25:18 +00:00
Achilleas Pipinellis ded170eb2e Merge branch 'patch-1' into 'master' 
Fix typo indentation in CI projects' API



See merge request !2561
 2016-02-02 12:16:35 +00:00
Dmitriy Zaporozhets b828e5faa4 Merge branch 'rs-regression-issue-guidelines' into 'master' 
Add notes about the regression issues to CONTRIBUTING.md

[ci skip]

See merge request !2661
 2016-02-02 11:08:50 +00:00
Yorick Peterse 494028445b Merge branch 'expand-git-instrumentation' into 'master' 
Expand Git instrumentation

This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants.

See merge request !2664
 2016-02-02 10:07:59 +00:00
Yorick Peterse 9dfc4511ff Updated contributing guide for stable releases 
Fixes #12784
 2016-02-02 10:52:47 +01:00
Robert Speicher 7df149bb63 Merge branch 'rs-relax-autosize' into 'master' 
Allow manual resize of js-autosize textareas

First, the autosize library was being too controlling and removed the
`resize` property from any elements to which it was attached, removing
the drag handle. We've disabled this behavior in the vendored library
and added a spec to prevent a regression during an upgrade.

Second, we detect (as best we can) when the user manually resizes an
autosize textarea, and then remove the autosize behavior from it and
increase its max-height.

This should allow for the best of both worlds.

Closes #12832

See merge request !2653
 2016-02-01 23:46:10 +00:00
Robert Speicher 933834c4a6 Allow manual resize of js-autosize textareas 
First, the autosize library was being too controlling and removed the
`resize` property from any elements to which it was attached, removing
the drag handle.

Second, we detect when the user manually resizes an autosize textarea,
and then remove the autosize behavior from it and increase its
max-height.

This should allow for the best of both worlds.

Closes #12832
 2016-02-01 17:00:03 -05:00
Robert Speicher ea11f0218a Update CHANGELOG 
[ci skip]
 2016-02-01 15:48:59 -05:00
Robert Speicher f8052310ad Merge branch 'merge-request-closes-issues-performance' into 'master' 
Optimize fetching issues closed by a merge request

Related issue: #12419

See merge request !2625
 2016-02-01 15:32:58 -05:00
Dmitriy Zaporozhets c3df208708 Merge branch 'stanhu/gitlab-ce-add-svg-support' into 'master' 
Render sanitized SVG images

Originally opened at !637 by @stanhu.

Closes https://github.com/gitlabhq/gitlabhq/issues/9265

![Screen_Shot_2016-02-01_at_17.04.01](/uploads/8e5de906698493e127dcdc475da9aaef/Screen_Shot_2016-02-01_at_17.04.01.png)


See merge request !2667
 2016-02-01 18:24:51 +00:00
Stan HuandRémy Coutable f86ddfd365 Render sanitized SVG images 
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
 2016-02-01 18:25:32 +01:00
Jacob Vosmaer 72bd004b31 Allow "@" in file names and path 2016-02-01 16:20:49 +01:00
Jacob Vosmaer b4e6ee7adc Update development version of gitlab_git 2016-02-01 15:19:55 +01:00
Yorick Peterse 33fb55a572 Instrument various Rugged constants 2016-02-01 15:03:58 +01:00
Jacob Vosmaer b1a7cb57cd Update gitlab_git@lazy-blob again 2016-02-01 14:41:35 +01:00
Jacob Vosmaer 29d376025d Update gitlab_git (lazy-blob branch) 2016-02-01 14:34:22 +01:00
Jacob Vosmaer d11d425acc Develop with a custom gitlab_git branch 2016-02-01 14:00:28 +01:00
Yorick Peterse 1256dabb44 Instrument all Gitlab::Git instance methods 2016-02-01 13:54:39 +01:00
Jacob Vosmaer 51574d779c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs 2016-02-01 13:51:05 +01:00
Jacob Vosmaer b1f22aa35a Gotta have newlines 2016-02-01 12:27:35 +01:00
Jacob Vosmaer b2a634c352 Avoid trailing 'charset=' garbage 2016-02-01 12:01:13 +01:00
Jacob Vosmaer 2679ec4066 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse 2016-02-01 11:33:36 +01:00
Jacob Vosmaer 02afa6793c Use only one header to send git blobs 2016-02-01 11:33:22 +01:00
Dmitriy Zaporozhets da8e0f8659 Merge branch 'take-guidelines-into-account-for-mrs' into 'master' 
Link to Thoughtbot review guidelines.



See merge request !2658
 2016-02-01 10:21:02 +00:00