Commit Graph
27331 Commits
Author SHA1 Message Date
Jacob Schatz cd19ce8b05 Merge branch 'note-username-text-color' into 'master'
Fixed issue with author link color on dark diffs

Correctly added a color to the author link

![Screen_Shot_2016-04-21_at_08.55.05](/uploads/ffa9e12e868c7b71fa4dd9244114274a/Screen_Shot_2016-04-21_at_08.55.05.png)

Fixes #15444

See merge request !3847
2016-04-21 15:52:45 +00:00
Stan Hu ffef71d99b Merge branch 'sidekiq-memory-sigterm' into 'master'
Use SIGTERM during Sidekiq memory shutdown

This makes the memory killer behave more like 'sidekiqctl stop'.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15359

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14462

See merge request !3853
2016-04-21 15:28:47 +00:00
Douwe Maan 7ded28ff99 Merge branch 'fix/label-filters' into 'master'
Filter labels by including ALL filter titles

Fixed query to use `AND` and not `OR`. Refactored relevant specs

See merge request !3815
2016-04-21 13:13:10 +00:00
Jacob Vosmaer 103c405339 Use SIGTERM during Sidekiq memory shutdown
This makes the memory killer behave more like 'sidekiqctl stop'.
2016-04-21 14:49:15 +02:00
Jacob Schatz 53534682a3 Merge branch 'revert-sentry-js' into 'master'
Revert "Merge branch 'sentry-js' into 'master'"

This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.

See merge request !3851
2016-04-21 12:15:20 +00:00
Dmitriy Zaporozhets f4859b93a5 Merge branch 'top-navigation-concept' into 'master'
Implement top navigation for profile area

Main idea is to keep left sidebar static so user is not confused by
changing context. Instead we put changing navigation with changing
content in one main block. I used profile area as a simplest way to 
implement and test this concept. Your feedback is welcome in comments

For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3824
2016-04-21 11:48:28 +00:00
Jacob Schatz 6211a8a8c0 Revert changelog too 2016-04-21 07:36:46 -04:00
Jacob Schatz b3f4e8b218 Revert "Merge branch 'sentry-js' into 'master' "
This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.
2016-04-21 07:27:27 -04:00
James Lopez b09b175def refactored specs based on feedback 2016-04-21 13:20:00 +02:00
Douwe Maan 7f3a22a7b3 Merge branch 'document-feature-freeze' into 'master'
Document the feature freeze starting on the 18th

cc @dzaporozhets @rspeicher @DouweM @rymai @axil 

See merge request !3698
2016-04-21 10:56:07 +00:00
Rémy Coutable 338f6f0902 Merge branch 'issue_5838' into 'master'
Show project members only for members

fixes #5838 

See merge request !3752
2016-04-21 10:31:20 +00:00
Yorick Peterse a5ed44fd71 Merge branch 'add-pg-trgrm-in-migration' into 'master'
Attempt to create pg_trgm extension in migration for test/dev environments

See merge request !3805
2016-04-21 09:10:45 +00:00
James Lopez 2d2b73ae49 use wait_for_ajax instead of sleeping for 2 days! 2016-04-21 10:30:48 +02:00
Grzegorz Bizon 677718fd02 Merge branch 'fix/cross-project-labels-project-reference' into 'master'
Fix cross-project label ref used with invalid project

When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception.

Closes #15168

See merge request !3811
2016-04-21 08:13:12 +00:00
Kamil Trzciński 140eba0cfa Merge branch 'addtap' into 'master'
add tap coverage example to project settings

Previously, there were examples for Simplecov, pytest-cov, and phpunit.
This adds an example for using the tap cli tool
(https://github.com/tapjs/node-tap)

Before:
![Screen_Shot_2016-04-07_at_9.57.32_AM](/uploads/2864d4cd4b5288565057263a435a851f/Screen_Shot_2016-04-07_at_9.57.32_AM.png)

After:

![Screen_Shot_2016-04-07_at_9.57.16_AM](/uploads/62901e01c4ad6db86e4ced3dfebd20b9/Screen_Shot_2016-04-07_at_9.57.16_AM.png)


See merge request !3597
2016-04-21 08:13:04 +00:00
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master'
Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653
2016-04-21 08:10:37 +00:00
Phil Hughes 2e0182b278 Fixed issue with author link color on dark diffs 2016-04-21 08:54:24 +01:00
Grzegorz Bizon 35d8bc4485 Refactor banzai code that finds cross-project labels 2016-04-21 09:13:34 +02:00
Grzegorz Bizon dcc45eda88 Add Changelog entry for cross-project label fix 2016-04-21 09:13:34 +02:00
Grzegorz Bizon f7348cd348 Fix cross-project label ref with invalid project
Closes #15168
2016-04-21 09:13:34 +02:00
James Lopez 6865bc16f8 refactored specs, adding more scenarios 2016-04-21 09:12:03 +02:00
James Lopez 07f8ffbdaf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters
# Conflicts:
#	spec/features/issues/filter_by_labels_spec.rb
2016-04-21 08:37:38 +02:00
Stan Hu dcd54f6345 Attempt to create pg_trgm extension in migration for test/dev environments
Closes #15210
2016-04-20 20:59:01 -07:00
Jacob Schatz 2ade37e253 Merge branch 'disable_spellcheck_for_username_field' into 'master'
Disable spellcheck and autocorrect for username field in admin page

closes #14855

## before
![Screen_Shot_2016-04-19_at_9.25.12_AM](/uploads/19387c4a11a879e9034a2179e932436e/Screen_Shot_2016-04-19_at_9.25.12_AM.png)

## after
![Screen_Shot_2016-04-19_at_9.25.47_AM](/uploads/60f4eba6a97201333dc64e46d625aac2/Screen_Shot_2016-04-19_at_9.25.47_AM.png)

See merge request !3730
2016-04-21 00:23:47 +00:00
Arinde EniolaandJacob Schatz 26166b774e add item to chengelog 2016-04-20 19:27:17 -04:00
Arinde EniolaandJacob Schatz 826857f47b disable spellcheck and autocorrect for username field in admin page 2016-04-20 19:27:17 -04:00
Jacob Schatz 7dc16fe6ba Merge branch 'issue_14678' into 'master'
Refresh page according remaining todos

Fixes #14678 

See merge request !3428
2016-04-20 22:26:21 +00:00
Robert Speicher 7e6d59067e Merge branch 'fix-grape-internal-allowed-action' into 'master'
Fix setting of "action" for Grape transactions

After wondering why we're not getting all the data in Grafana that I
wanted I realized I wasn't setting the "action" field properly here.

See merge request !3842
2016-04-20 21:27:43 +00:00
Jacob Schatz 07c5df51eb Merge branch 'revert-diff-scroll' into 'master'
Wrap all code in diffs

Closes #15382  
Closes #15422  
All diff code wraps to next line instead of scrolling

<img src="/uploads/ec5754919bac0b027fcb122bb88435b3/Screen_Shot_2016-04-20_at_12.22.27_PM.png" width="500px">

See merge request !3838
2016-04-20 21:12:38 +00:00
Robert Speicher ef8377b7d2 Update CHANGELOG for 8.6.7, 8.5.11, 8.4.9, 8.3.8
[ci skip]
2016-04-20 17:02:00 -04:00
Robert Speicher 91c00faee8 Merge branch 'due-date-frontend' into 'master'
Add due date to issues

Closes: #12709

See merge request !3614
2016-04-20 20:43:25 +00:00
Yorick Peterse a257d117a0 Fix setting of "action" for Grape transactions
Merely setting the "action" tag will only result in the transaction
itself containing a value for this tag. To ensure other metrics also
contain this tag we must set the action using Transaction#action=
instead.
2016-04-20 22:42:52 +02:00
Robert Speicher 0fa1c4191a Merge branch 'commit-message-contribution' into 'master'
Articles on proper commit messages

2 Articles on commit messages

[ci skip]

See merge request !3831
2016-04-20 20:10:18 +00:00
Robert Speicher 0f309794e7 Merge branch 'sentry-js' into 'master'
Add Sentry logging for JavaScript errors

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675

See merge request !3795
2016-04-20 19:52:27 +00:00
Rémy CoutableandRobert Speicher 3a7290f387 Move Issue scopes from Issuable to Issue model
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher da2e31549c Forgot a Rubocop offense, doh!
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher e54a2ba6aa Remove duplicate hidden_field and fix Rubocop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher 159f959b61 Move due_date sort scopes to Issue and fix CHANGELOG
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher 6cdf4acd4e Address MR feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 5c8959bbc1 Added variables 2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 461608e14c replace hyphens to commas when converting date 2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 4eeef19824 Fixed date issue with timezones 2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 49628664ee Removed buttons instead clicking date sets it
Fixed issue with dropdown not being toggleable again
2016-04-20 15:43:32 -04:00
Phil HughesandRobert Speicher 989bcfcc7a Mobile value color for due date 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher e219867cd0 Updates sidebar value 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher 720da4196c Updated based on designs 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher f56c626315 Fixed issue with bootstrap dropdown closing the calendar 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher 7617ae2565 Fixed issue with selectbox not hiding 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher aa22106b30 Posts the due date through AJAX 2016-04-20 15:42:09 -04:00
Phil HughesandRobert Speicher 05523b5bd1 Removed due date filter 2016-04-20 15:42:09 -04:00