home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,963 Commits 48 Branches 340 Tags
f680eca912f854373fc538ae1e9d0dcb60fcd310
Commit Graph
788 Commits
Author SHA1 Message Date
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 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
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
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 d53bfcb0bb Updated snippets tests 2016-05-19 10:01:27 +01: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
Dmitriy Zaporozhets 79b9ff6076 Modify tests to match new navigation behaviour for project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-16 12:36:27 -05:00
Kamil Trzcinski 7d907acc38 Fix spinach tests 2016-05-14 14:51:57 -05:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Robert Speicher d8415389de Merge branch 'hook-docs-behavior' into 'master' 
Improve documentation and web test for web hooks

Tips and documentation of actual hook behavior. Improved user feedback
when testing hooks via the web UI.

See merge request !4015
 2016-05-11 16:34:00 +00:00
Rémy Coutable 1026f2ad09 Add integration specs for tags 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-10 11:45:03 +02:00
Jacob Vosmaer a19508d6b7 Fix test failures 2016-05-09 13:58:43 +02:00
Robert Speicher f18ec70743 Backport changes from gitlab-org/gitlab-ee!372 
Mostly replaces several Spinach tests with RSpec Feature tests.
 2016-05-04 17:05:16 -04:00
Rémy Coutable 44f89eafc0 Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-04 17:19:13 +02:00
Jacob Schatz 14c2c573a3 Merge branch 'project-webhooks-ui' into 'master' 
Project webhooks updated UI

Closes #13993 

![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png)

![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png)

See merge request !3922
 2016-04-28 20:16:36 +00:00
Phil Hughes b651303ea6 Updated tests 2016-04-26 14:14:34 +01:00
Phil Hughes 54493b9aae Updated tests for deploy keys 2016-04-25 17:45:05 +01: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
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master' 
Mutliple label filter

Fixes #989 

See merge request !3438
 2016-04-20 19:18:32 +00:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master' 
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 2016-04-20 01:38:49 +00:00
Robert Speicher 7b09bab68e Merge branch 'mr-formatting' into 'master' 
use ! rather than # for merge request references

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

See merge request !3740
 2016-04-19 16:23:41 +00:00
Ben Bodenmiller b68e3925ff format merge request references properly 2016-04-18 23:32:02 -07:00
Rémy Coutable b2370fefad Fix specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Rémy Coutable 0aaaae9d05 Fix features specs (hopefully) 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Robert Speicher 7cc239528e Remove persistent XSS vulnerability in commit_person_link helper 
Because we were incorrectly supplying the tooltip title as
`data-original-title` (which Bootstrap's Tooltip JS automatically
applies based on the `title` attribute; we should never be setting it
directly), the value was being passed through as-is.

Instead, we should be supplying the normal `title` attribute and letting
Rails escape the value, which also negates the need for us to call
`sanitize` on it.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
 2016-04-17 18:42:49 -04:00
Kamil Trzcinski 065e0c0fe4 Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 
# Conflicts:
#	db/schema.rb
 2016-04-16 19:55:14 +02:00
Arinde Eniola 5f53ca69ac fix failing tests 2016-04-14 11:16:24 +01:00
Phil Hughes 02cfff4623 Removed references to subscribe-button CSS class 
These were being blocked by adblocks

Closes #15043
 2016-04-12 13:35:06 +01:00
Kamil Trzcinski 52be9e20f9 Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 
# Conflicts:
#	app/views/projects/commits/_commit.html.haml
 2016-04-11 23:33:50 +02:00
Kamil Trzcinski af7214d0f0 Fix specs 2016-04-11 23:32:55 +02:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master' 
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
 2016-04-11 11:25:40 +00:00
Phil Hughes 643fe43d78 Addressed feedback 
Removed important from css
 2016-04-11 09:43:59 +01:00
Jacob Schatz 283ecf6e48 Merge branch 'redesign_labels_page' into 'master' 
Redesign labels page

closes #14227 

## Desktop
![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png)

## Mobile
![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png)

See merge request !3507
 2016-04-10 14:05:22 +00:00
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'" 
This reverts merge request !3494
 2016-04-07 21:20:16 +00:00
Phil Hughes 1ca627f782 Fixed tests 2016-04-07 16:10:44 +01:00
Arinde Eniola ffe2f8e679 fix the failing tests and some changes 2016-04-06 20:27:30 +01:00
Phil Hughes 017ed4ae37 Fixed builds 2016-04-06 12:52:07 +01:00
Phil Hughes b310058998 Use new dropdowns for MR compare 2016-04-06 11:08:40 +01:00
Phil Hughes 7fe19046d6 Fixed failing tests 2016-04-06 11:08:40 +01:00
connorshea b9abf938ed Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter. 
Resolves #14411.

See merge request !3464
 2016-04-04 19:44:07 -06:00
Dmitriy Zaporozhets 2ed6cd9e46 Merge branch 'new-navigation-prototype' into 'master' 
Two level hierarchy  in navigation sidebar

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

See merge request !3494
 2016-04-02 10:20:17 +00:00
Dmitriy Zaporozhets 31b27adeb8 Fix milestones tab active state and tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-02 11:26:46 +02:00
Dmitriy Zaporozhets 847940516b Fix some active tab tests that are broken because of 2 level sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 22:35:49 +02:00