home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,470 Commits 48 Branches 340 Tags
a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58
Commit Graph
1513 Commits
Author SHA1 Message Date
Kamil Trzcinski eb95019178 Enable Knapsack only in CI environment 2016-06-08 11:43:13 +02:00
Jacob Schatz babf20c8ab Merge branch 'notification-dropdown-labels' into 'master' 
Notifications dropdown on project page now has descriptions

## What does this MR do?

Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense.

## What are the relevant issue numbers?

Part of #12758

## Screenshots (if relevant)

![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png)

See merge request !4374
 2016-06-07 18:06:37 +00:00
Jacob Schatz 7d315aecfb Merge branch '18013-compact-sidebar' into 'master' 
Implement compact side nav

## What does this MR do?
Implements new compact nav design   
Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268)

## What are the relevant issue numbers?
Closes #18013 

## Screenshots (if relevant)
![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png)   
![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png)

cc @dzaporozhets 

See merge request !4447
 2016-06-07 17:00:44 +00:00
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master' 
Ability to prioritize labels

Closes #14189 

See merge request !4009
 2016-06-07 15:15:07 +00:00
Annabel Dunstone ca985283b4 Remove todos count tests in nav 2016-06-07 09:16:59 -05:00
Phil Hughes 51a62fce04 Fixed failing tests 2016-06-07 15:02:00 +01:00
Douwe Maan 3fd0b364ea Merge branch 'knapsack' into 'master' 
Use Knapsack to evenly distribute specs

Try to distribute all tests evenly accross all nodes to reduce the testing time of GitLab CE.

This uses high amount of auto-scaled machines.


See merge request !4240
 2016-06-07 13:44:06 +00:00
Jacob Vosmaer (GitLab) afa21054fa Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 
Workhorse to serve raw diffs

Fixes (partially) #13999

Dependent on: gitlab-org/gitlab-workhorse!45

See merge request !4130
 2016-06-07 12:50:29 +00:00
Kamil Trzcinski 0b4981e771 Merge remote-tracking branch 'origin/master' into knapsack 
# Conflicts:
#	.gitlab-ci.yml
 2016-06-07 10:29:43 +02:00
Kamil Trzcinski 6e64d1ac76 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-07 10:26:27 +02:00
Alfredo Sumaran d6cecf7add Fix failing tests 2016-06-06 11:59:49 -05:00
Alejandro Rodríguez 535d11302e Remove prev/next buttons on issues and merge requests 
The buttons were rarely used and added at least 1 query each on every page load.
 2016-06-06 12:01:50 -04:00
Kamil Trzcinski 842f0a3401 Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 
# Conflicts:
#	features/steps/shared/builds.rb
#	spec/requests/ci/api/builds_spec.rb
 2016-06-06 11:21:39 +02:00
Kamil Trzcinski 7ad7e10fee Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-06 11:20:17 +02:00
Kamil Trzcinski 9614c52266 Fix tests offenses: use pipeline of Ci::Build and rename views 2016-06-06 11:19:54 +02:00
Alfredo Sumaran 5a474ff8da Ensure we are clicking a visible dropdown 2016-06-03 17:11:41 -05:00
Zeger-Jan van de Weg 01e1139f68 Workhorse to serve raw diffs 2016-06-03 18:43:22 +02:00
Kamil Trzcinski 86498d4d99 Use knapsack everywhere 2016-06-03 17:39:53 +02:00
Kamil Trzcinski 77f8deec2c Use own version of knapsack which supports spinach tests 2016-06-03 17:08:18 +02:00
Kamil Trzcinski 8d8d2759ef WIP 2016-06-03 17:08:18 +02:00
Kamil Trzcinski 0a1fccb2ed Try to use knapsack 2016-06-03 17:08:17 +02:00
Kamil Trzcinski 20c7144ed2 Rename all [ci_]commit to [ci_]pipeline in specs and features 2016-06-03 16:22:26 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Kamil Trzcinski 0a51c95464 Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-03 13:10:01 +02:00
Kamil Trzcinski 717fdd6d42 Rename Ci::Build commit to pipeline 2016-06-03 12:29:00 +02:00
Dmitriy Zaporozhets db2109b086 Fix more tests with new Code tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets 7cfb445c15 Update tests to match new Code tab logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-03 10:13:40 +03:00
Josh Frye 2605a0a844 Refactor. Add tests. 2016-06-02 11:10:57 -04:00
Kamil Trzcinski 021d3810c3 Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline 2016-06-02 16:59:04 +02:00
Z.J. van de Weg 91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Grzegorz Bizon 2bb0eecb20 Enable Style/SpaceAfterMethodName rubocop cop 
See #17478
 2016-05-30 14:41:34 +02:00
Grzegorz BizonandRobert Speicher dbba60029c Improve note factory 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
Jacob Schatz 3d009f7785 Merge branch 'updated-contrib-calendar' into 'master' 
POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944
 2016-05-25 23:29:41 +00:00
Jacob Schatz 891c94852d Merge branch 'fix-grammar-issues' into 'master' 
Fix grammar and wording in text on various pages.

## What does this MR do?

Fixes various grammatical and/or wording issues I found while copyediting on the plane :)

## Why was this MR needed?

Incorrect grammar and weird/confusing wording makes the product look less polished and professional.

See merge request !4237
 2016-05-25 19:26:22 +00:00
Dmitriy Zaporozhets c04f85a333 Merge branch 'rs-rubocop-nottonot' into 'master' 
Enable RSpec/NotToNot cop and auto-correct offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761

See merge request !4267
 2016-05-25 16:46:29 +00:00
ZJ van de Weg 6523002267 Remove old tests, and use right factories 2016-05-25 15:43:07 +02:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
Jacob Schatz d6e5299fb6 Merge branch 'snippets-ui' into 'master' 
Updated snippets UI

![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png)

Closes #14328

See merge request !4194
 2016-05-24 21:15:19 +00:00
Jacob Schatz 05323a7855 Merge branch 'project-settings' into 'master' 
Project settings UI update

![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png)

See merge request !4162
 2016-05-24 21:11:30 +00:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses 
Also removes the note from the development/testing.md guide
 2016-05-24 15:40:29 -04:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Connor Shea 1a85f80b78 Fix grammar and wording in text on various pages. 2016-05-22 10:41:30 -06:00
Phil Hughes 10e3de7a45 Fixed project settings tests 2016-05-20 08:49:31 +01:00
Phil Hughes d53bfcb0bb Updated snippets tests 2016-05-19 10:01:27 +01:00
Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb
 2016-05-18 13:05:53 -05:00
Kamil Trzcinski bfc6799c93 Fix spinach tests 2016-05-16 18:13:44 -05:00
Dmitriy Zaporozhets 442083e0fc Fix file browsing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-16 17:56:39 -05:00
Dmitriy Zaporozhets ff5109e19c Fix shortcuts tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-16 17:36:06 -05:00