home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,525 Commits 48 Branches 340 Tags
4beae990b37e3583485bb33f03e08e3cc798ff37
Commit Graph
23525 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 4beae990b3 Refactor nav controls section (search and new project/group btn) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 16:14:11 +01:00
Dmitriy Zaporozhets df922d8115 Add number_with_delimiter and remove unnecessary dara placement for groups page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 16:14:11 +01:00
Dmitriy Zaporozhets 639b25e34c Improve UI consistency between projects and groups lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 16:14:11 +01:00
Achilleas Pipinellis bb51e9c66e Merge branch 'fix-build-artifacts-doc' into 'master' 
Cleanup artifacts section in Docs

- Added Note that artifact collection is only done for successful builds.
- Cleaned up Windows Support and Version notes.

See merge request !2619
 2016-02-03 14:32:13 +00:00
Rémy Coutable c1faa836f6 Merge branch 'improve-environment-variables-doc' into 'master' 
Improving the "Environment variables" administration doc

Closes #12829.

/cc @sytses 

See merge request !2669
 2016-02-03 13:47:19 +00:00
Achilleas Pipinellis 9fbe9d97ed Unicorn worker killer is not Omnibus specific 
[ci skip]
 2016-02-03 14:18:51 +02:00
Achilleas Pipinellis ea14429b7e Clean up environment variables doc 
[ci skip]
 2016-02-03 13:56:23 +02:00
Achilleas Pipinellis 43d8dbaedd Merge branch 'update_doc' into 'master' 
Update OAuth doc



See merge request !2589
 2016-02-03 11:23:22 +00:00
Achilleas Pipinellis cbd550cfa6 Refactor OAuth provider documentation 
[ci skip]
 2016-02-03 13:18:37 +02:00
Achilleas Pipinellis 2e056d5ee2 Merge branch 'aral/gitlab-ce-master' into 'master' 
Added note: working copy changes should be stashed before update process

Originally proposed by @aral in !1043.

Added note: working copy changes (e.g., deleted vendor folder) should be stashed before beginning the update process.
We should probably include this notice on all update guides.

See merge request !2668
 2016-02-03 09:58:08 +00:00
Robert Speicher 8a85906a74 Merge branch 'support-akismet' into 'master' 
Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
 2016-02-03 01:26:30 +00:00
Robert Speicher fcfafffef5 Merge branch 'fix-tooltips-admin-nav' into 'master' 
Improve tooltips on admin menu

See merge request !2673
 2016-02-03 00:17:41 +00: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
Malte BlättermannandMalte Blättermann acea6e1c50 Documentation cleanup of artifacts section in Gitlab CI Readme 
- Added notice about build artifacts not beeing collected on failed builds.
- Removed "introduced in 0.7.0" for artifacts section.
- Made windows notice more precise
 2016-02-02 22:43:15 +01: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
Douglas Barbosa Alexandre dffacbb12c Update CHANGELOG 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 0ea5d764f2 Hide the link for spam logs if the Askimet is disabled 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 07384aa00d Memoize Akismet client initialization on AkismetHelper 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre eefc46e0d5 Fix rubocop offenses 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 718b1dddfe Refactor Admin::SpamLogsController to block user before destroying 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre a2bbf00477 Refactor spam filtering on issues API 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 62cad887ea Use time_ago_with_tooltip on spam logs list 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre e38a1fc83e Fix typo on User model 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 80d0a2a6d8 Add model spec for SpamLog 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 64c9768bd6 Use truncate helper on spam logs list 2016-02-02 11:25:44 -02:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02: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
Zeger-Jan van de Weg 7eb961f081 Improve tooltips on admin menu 2016-02-02 11:17:20 +01: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