home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 22:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,839 Commits 48 Branches 340 Tags
aeb5262d427e1b61ded71cc4a20e8e2a7a0089ef
Commit Graph
28839 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Long Nguyen aeb5262d42 Add changelog and code refactor 2016-05-30 22:32:07 +07:00
Long Nguyen 41f8e6a4d7 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_17479_todos_not_remove_when_leave_project 2016-05-30 22:24:43 +07:00
Yorick Peterse 2485bd7bbf Merge branch 'add-index-users-on-state' into 'master' 
Add DB index on users.state

See merge request !4336
 2016-05-30 09:30:07 +00:00
Stan Hu 9485b65abb Add DB index on users.state 
Closes #17920
 2016-05-29 23:03:08 -07:00
Robert Speicher 43c35b0f20 Merge branch 'feature/note-validator' into 'master' 
Improve note validation

This MR improves note validation. Originates from #15577.

Closes #17260

See merge request !4024
 2016-05-30 04:07:19 +00:00
Robert Speicher f36e7ff2f9 Shut up, RuboCop 
❤️
 2016-05-29 23:12:19 -04:00
Robert Speicher c84ec18fcc Merge branch 'update_gitignore' into 'master' 
Use absolute paths in .gitignore

See merge request !4335
 2016-05-29 23:04:30 +00:00
Ruben Davila f0930feac9 Use absolute paths wherever is possible for .gitignore entries. 2016-05-29 16:55:25 -05:00
Ruben Davila 1c09c21a97 Ignore files under "/shared" directory and not other subdirectories that contains that name 
It's working fine now but by making it more explicit we can make tools
like 'The Silver Searcher' to parse properly the .gitignore file
 2016-05-29 16:55:25 -05:00
Grzegorz BizonandRobert Speicher 1286b9c3b5 Move Changelog entry for note validation to 8.9 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher dbba60029c Improve note factory 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher cc2efcf1a6 Improve notes factory 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher 77648aac86 Add Changelog entry for note validation improvements 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher fc57d36018 Minor changes in note validation specs 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher 99ef3a84b5 Validate presence of noteable_type in note model 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher e558edd1ce Update specs to carry out changes in note factory 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher 21d0cddd45 Do not override foreign attributes in note factory 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher 0e613db76d Add more validation tests for note model 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher 57b551a19f Remove redundant with_options from note validators 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher bf0b51d252 Update note factory to include noteable association 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher 87c44b0e91 Improve note validation for project mismatch 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher c31a296c94 Make note invalid if noteable project is different 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher f739a4e871 Remove reduntant note validation from create service 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher 1bcb1ef85e Update specs for creating new note without access 2016-05-29 15:03:00 -04:00
Jacob Schatz 32b9276c25 Merge branch 'consistent-snippet-prefix' into 'master' 
Use $ as the snippet prefix so it's consistent

## What does this MR do?

Change like `Snippet #20073` to `Snippet $20073`

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

Are there any other places need this change?

See merge request !4338
 2016-05-28 15:11:47 +00:00
Lin Jen-Shin 908ea1b00a Use $ as the snippet prefix so it's consistent 2016-05-28 22:03:30 +08:00
Stan Hu 18d454144f Merge branch 'zj-race-condition-pending-delete' into 'master' 
Project#show on projects pending deletion will 404

fixes #17508

See merge request !4156
 2016-05-28 13:39:49 +00:00
Zeger-Jan van de WegandStan Hu be613de2cf Project#show on projects pending deletion will 404 
fixes #17508
 2016-05-28 03:14:43 -07:00
Robert Speicher f9bb9151b5 Merge branch 'fix/migration-uri-issue' into 'master' 
Fix import URL migration error

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

See merge request !4321
 2016-05-27 17:35:28 +00:00
Jacob Schatz 051b2bfa4b Merge branch 'bendyorke-comment-fix' into 'master' 
Update notes immediately after closing/reopening

## What does this MR do?
Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke!
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
Constant conflicts in that MR
## What are the relevant issue numbers?

## Screenshots (if relevant)

Fixes #15091 

See merge request !4323
 2016-05-27 17:11:41 +00:00
Jacob Schatz c39ee747dc Merge branch 'calendar-activity-button-click' into 'master' 
Fixed issue with calendar activity button not sending request correctly

When you click on a square it now sends the AJAX to the correct URL rather than the current URL. This was causing an issue where it would be loading the same page & inserting that into the DOM, rather than calendar activity events.

See merge request !4322
 2016-05-27 16:39:08 +00:00
Ben YorkeandJacob Schatz 31e5f081e4 Update notes immediately after closing/reopening 2016-05-27 12:10:28 -04:00
Phil Hughes a9785a4adb Fixed issue with calendar activity button not sending request correctly 2016-05-27 16:35:20 +01:00
James Lopez e60d5f9188 fix rescue block on migration 2016-05-27 17:20:15 +02:00
Jacob Schatz d59f0d90e4 Merge branch 'issuable-header-by-spacing' into 'master' 
Fixed issue with spacing in issuable header

## What does this MR do?

Fixes an issue with spacing next to the word 'by' in the issuable header

## What are the relevant issue numbers?

Closes #17864 

## Screenshots (if relevant)

![Screen_Shot_2016-05-27_at_11.53.37](/uploads/464c2149df304109726b7d7ab855ebe1/Screen_Shot_2016-05-27_at_11.53.37.png)

See merge request !4314
 2016-05-27 12:18:14 +00:00
Yorick Peterse ce0382b240 Merge branch 'workhorse-0.7.4' into 'master' 
Use gitlab-workhorse 0.7.4

See merge request !4317
 2016-05-27 12:04:15 +00:00
Yorick Peterse dda175a82f Merge branch 'queue-time-changelog' into 'master' 
Changelog entry for queue duration

See merge request !4316
 2016-05-27 11:56:37 +00:00
Jacob Schatz 952db59f07 Merge branch 'fix-multiple-ci-status-poll' into 'master' 
Fixed potential issue with 2 ci status polling events happening

Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue.

Also passed in the CI status as an option value rather than waiting for the first ajax request to finish

See merge request !3869
 2016-05-27 11:36:01 +00:00
Jacob Vosmaer 1adaeb7d67 Use gitlab-workhorse 0.7.4 
This enables
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4278 .
 2016-05-27 13:06:02 +02:00
Jacob Vosmaer 1e450ae2a7 Changelog entry for queue duration 2016-05-27 12:59:40 +02:00
Phil Hughes d84992375c Fixed issue with spacing in issuable header 
The Ruby was returning the HTML without a spacing next to the word 'by'

Closes #17864
 2016-05-27 11:51:32 +01:00
Jacob Schatz 61072a0244 Merge branch 'fix-shortcuts-spec' into 'master' 
Ensure project name is present on page

## What does this MR do?
Fixes a failing spec




See merge request !4307
 2016-05-27 01:39:46 +00:00
Jacob Schatz 29db3f2c52 Merge branch 'filter-by-any-user' into 'master' 
Filter issuables by any user

![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif)

Closes #2836

See merge request !3820
 2016-05-26 22:00:22 +00:00
Robert Speicher fb83f4bfc0 Merge branch 'rs-remove-pending-spec' into 'master' 
Remove boilerplate spec file for Ci::RunnerProject

See merge request !4309
 2016-05-26 21:54:31 +00:00
Robert Speicher 1087b26bf2 Remove boilerplate spec file for Ci::RunnerProject 
[ci skip]
 2016-05-26 17:52:43 -04:00
Robert Speicher 1d2d67b9e3 Merge branch 'fix/gitlab-importer-issue' into 'master' 
Fix gitlab importer issue

Fixed credentials not being called correctly - probably some bad refactoring or search & replace... 

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4301
 2016-05-26 21:36:01 +00:00
Jacob Schatz 9576f77cae Merge branch 'scroll-links-bug' into 'master' 
Fix bug where fade div covers up controls button

## What does this MR do?
Fixes bug where fade div covers up controls button

## Screenshots (if relevant)
Before:     
<img src="/uploads/a6a883839255b8e10d872759a1aa54a0/Screen_Shot_2016-05-26_at_2.22.08_PM.png" width="300px">      
After:        
<img src="/uploads/9ab53d9815470cf86f68f5a340ffc454/Screen_Shot_2016-05-26_at_2.22.42_PM.png" width="300px">

See merge request !4306
 2016-05-26 21:22:30 +00:00
Alfredo Sumaran bb3111c116 Ensure project name is present on page 2016-05-26 16:11:58 -05:00
Robert Speicher 03f26a4091 Merge branch 'remove-unnecessary-titles' into 'master' 
Remove header title from project pages

With new navigation design it makes no sense to duplicate title in the header.

See merge request !4304
 2016-05-26 20:18:21 +00:00
Annabel Dunstone 7903e44efc Fix bug where fade div covers up controls button 2016-05-26 14:21:34 -05:00