home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,326 Commits 48 Branches 340 Tags
63444936559cffba174a69c01d2425fb6b5e61cf
Commit Graph
22326 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher 6344493655 Use to_s(:iso8601) where appropriate 2016-01-07 20:01:08 -05:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Robert Speicher 59305715e9 Remove stamp gem 
Closes #5908
 2016-01-07 16:28:33 -05:00
Robert Speicher b1539116f6 Merge branch 'task-list-class' into 'master' 
Properly set task-list class on single item task lists

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

See merge request !2330
 2016-01-07 20:10:07 +00:00
Robert Speicher 87000b25f5 Merge branch 'gemfile-lock' into 'master' 
Update Gemfile.lock

My Bundler didn't agree with the previous order.

See merge request !2331
 2016-01-07 19:31:30 +00:00
Robert Speicher 90510f0037 Merge branch 'milestone-ref' into 'master' 
Link to milestone in "Milestone changed" system note

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

See merge request !2203
 2016-01-07 19:22:43 +00:00
Dmitriy Zaporozhets 3c93e588e9 Merge branch 'annotate-models-20160105' into 'master' 
Annotate models

Time to refresh the comments via `annotate`.


See merge request !2311
 2016-01-07 18:22:32 +00:00
Dmitriy Zaporozhets aacda0823e Merge branch 'ajax-issues-fix' into 'master' 
fixes ajax issue with issue spec



See merge request !2333
 2016-01-07 18:19:47 +00:00
Jacob Schatz 8f6ca70055 fixes ajax issue with issue spec 2016-01-07 12:27:01 -05:00
Dmitriy Zaporozhets 0d59e7b90f Merge branch 'ajax-filter-commits' into 'master' 
Ajax filter commits

Fixes #3509 

![Screenshot_2016-01-06_13.07.53](/uploads/7400d855d8207e37e3c0ec09cb2265e9/Screenshot_2016-01-06_13.07.53.png)


See merge request !2314
 2016-01-07 15:03:16 +00:00
Douwe Maan 79938744a8 Merge branch 'master' into task-list-class 2016-01-07 15:52:58 +01:00
Douwe Maan c3865bda02 Properly set task-list class on single item task lists 2016-01-07 15:52:34 +01:00
Dmitriy Zaporozhets c7fc84f516 Use fadeTo instead of css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets 44dc9aa69e Fix typo in js method and some repeating css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets 4443a5f3c7 Add support for ref and path to commits filtering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets b2b4e9a7eb Prevent loading first 20 commits twice 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets 0456855911 Add CHANGELOG item and tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets d1a40e06cc Add ajax filtering for commits list 
Also handle commits list with Pager class to prevent code duplication

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets 5e93f912c3 Add search field to commits page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets 9a250ad6d8 Filter commits by search parameter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-07 15:16:10 +01:00
Yorick Peterse 61561a9eeb Merge branch 'remove-more-influxdb-tags' into 'master' 
See merge request !2328
 2016-01-07 13:38:42 +00:00
Douwe Maan 9f268708df Merge branch 'find-file-credit' into 'master' 
Credit koreamic for creating Find File



See merge request !2327
 2016-01-07 13:10:50 +00:00
Douwe Maan 892d5dbb87 Update Gemfile.lock 2016-01-07 14:10:23 +01:00
Dmitriy Zaporozhets 3b04268f68 Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master' 
Suggest prefacing find command with sudo when base permissions are wrong

Closes #5872

See merge request !2299
 2016-01-07 12:24:06 +00:00
Dmitriy Zaporozhets 8d0886d6d0 Merge branch 'fix-missing-day-in-network-graph' into 'master' 
Fix missing date of month in network graph when commits span a month

Closes #3635, #1383

Before:

![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png)

After:

![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png)


See merge request !2325
 2016-01-07 12:10:57 +00:00
Yorick Peterse 7b10cb6f0f Store request methods/URIs as values 
Since filtering by these values is very rare (they're mostly just
displayed as-is) we don't need to waste any index space by saving them
as tags. By storing them as values we also greatly reduce the number of
series in InfluxDB.
 2016-01-07 13:05:00 +01:00
Douwe Maan 15d689abae Credit koreamic for creating Find File 2016-01-07 13:04:09 +01:00
Jacob Vosmaer 09216e8bbd Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:57:36 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Douwe Maan 5c7de8511f Merge pull request #9889 from koreamic/file_finder 
Add new feature to find file(recreate)
 2016-01-07 12:48:17 +01:00
Yorick Peterse 364b07cff0 Removed UUIDs from metrics transactions 
While useful for finding out what methods/views belong to a transaction
this might result in too much data being stored in InfluxDB.
 2016-01-07 12:44:15 +01:00
Yorick Peterse da912c8f4c Merge branch 'revert-influxdb-milliseconds' into 'master' 
See merge request !2326
 2016-01-07 11:39:02 +00:00
Douwe Maan 539b41929b Milestone reference is a Markdown link 2016-01-07 12:26:05 +01:00
Douwe Maan b38eabdaf6 Fix changelog 2016-01-07 12:10:35 +01:00
Yorick Peterse 7ed3a5a240 Revert "Store SQL/view timings in milliseconds" 
This reverts commit 7549102bb7.

Apparently I was wrong about
ActiveSupport::Notifications::Event#duration returning the duration in
seconds, instead it returns it in milliseconds already.
 2016-01-07 11:47:06 +01:00
koreamic 8884505350 Add new feature to find file 
Using the fuzzy filter, develop "file finder" feature.
- feedback(http://feedback.gitlab.com/forums/176466-general/suggestions/4987909-add-file-finder-fuzzy-input-in-files-tab-to-ju )
- fuzzy filter(https://github.com/jeancroy/fuzzaldrin-plus)
- shortcuts(when "t" was hitted at tree view, go to 'file find' page and 'esc' is to go back)
- depends on gitlab_git 7.2.22
 2016-01-07 18:35:16 +09:00
Achilleas Pipinellis 0deeebc175 Merge branch 'doc_enable_disable_ci' into 'master' 
Add documentation on enabling/disabling GitLab CI

Closes #4289

See merge request !2320
 2016-01-07 09:12:46 +00:00
Yorick Peterse ee9432a79a Merge branch 'remove-influxdb-credentials' into 'master' 
See merge request !2319
 2016-01-07 09:12:08 +00:00
Achilleas Pipinellis a8e23bd1b5 Fix hyphenation typos [ci skip] 2016-01-07 10:10:46 +01:00
Stan Hu 7d013f7848 Fix missing date of month in network graph when commits span a month 
Closes #3635, #1383
 2016-01-06 21:05:46 -08:00
Achilleas Pipinellis 12e32224c1 Add documentation on enabling/disabling GitLab CI 
[ci skip]
 2016-01-06 20:18:27 +01:00
Robert Speicher d47b3e63d5 Merge branch 'more-opengraph' into 'master' 
Add Open Graph data for group, project and commit.

See merge request !2211
 2016-01-06 19:11:05 +00:00
Robert Speicher b93744e300 Merge branch 'merge-when-build-succeeds-unchecked' into 'master' 
Get "Merge when build succeeds" to work when commits were pushed to MR
target branch while builds were running

The Merge when build succeeds service only merges when the MR is
mergeable (open, not WIP, no conflicts).

When the target branch is updated, all affected MRs have their merge
status set to `unchecked`, and the conflicts check will only happen
when `check_if_can_be_merged` is called, which happens when the MR page
is viewed.

When someone enables the automatic merge, the target branch is updated,
no-one views the MR page again, and the build succeeds, the mergeability
check will fail and the MR will not in fact be merged.

This MR makes sure `check_if_can_be_merged` is always called when MR
mergeability is checked.

See merge request !2304
 2016-01-06 18:58:10 +00:00
Douwe Maan 6865d3e500 Merge branch 'rs-issue-1697' into 'master' 
Define a limited set of filters for SingleLinePipeline

Removes the following filters from its parent GfmPipeline:

- SyntaxHighlightFilter
- UploadLinkFilter
- TableOfContentsFilter
- LabelReferenceFilter
- TaskListFilter

Closes #1697 

See merge request !2257
 2016-01-06 18:31:28 +00:00
Robert Speicher 623fa2caf7 Merge branch 'fix-banzai-cache' into 'master' 
Fix mentionable reference extraction caching.

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

Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283

See merge request !2315
 2016-01-06 18:11:46 +00:00
Yorick Peterse 8fdc00bd4c Remove InfluxDB username/password 
InfluxDB over UDP doesn't use authentication, thus there's no need for
these settings.
 2016-01-06 17:49:56 +01:00
Yorick Peterse bcd2a09da7 Merge branch 'metrics-milliseconds' into 'master' 
See merge request !2316
 2016-01-06 16:41:55 +00:00
Stan Hu fc386b65d0 Merge branch 'azure_oauth2' into 'master' 
Enable Microsoft Azure OAuth2 support

Added Microsoft Azure as OAuth2 provider (https://github.com/KonaTeam/omniauth-azure-oauth2) including docs and icon.

See merge request !2187
 2016-01-06 16:22:44 +00:00
Yorick Peterse 7549102bb7 Store SQL/view timings in milliseconds 
Transaction timings are also already stored in milliseconds, this keeps
things consistent.
 2016-01-06 16:37:14 +01:00
Janis Meybohm da53fcba2d Enable Microsoft Azure OAuth2 support 2016-01-06 14:30:43 +01:00