root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
33,649 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

292 Commits

Author SHA1 Message Date
Jacob Schatz 0452e0a57e Merge branch 'master' into faster-diffs 2016-07-11 17:19:17 -04:00
Douwe Maan 5a8f727fd5 Merge branch 'master' into faster-diffs 
# Conflicts:
#	app/helpers/notes_helper.rb
#	app/views/projects/diffs/_line.html.haml
#	app/views/projects/diffs/_parallel_view.html.haml
#	app/views/projects/diffs/_text_file.html.haml
#	features/steps/shared/diff_note.rb
 2016-07-07 18:05:34 -04:00
Jacob Schatz 5541e55c49 Merge branch 'issues-blank-state' into 'master' 
Added blank state to issues

## What does this MR do?

Adds new blank state to issues when no issues exist.

Part of #18519 

## Screenshots (if relevant)

![Screen_Shot_2016-06-24_at_16.37.12](/uploads/0c3f385615b29216ef1137bd6fac06af/Screen_Shot_2016-06-24_at_16.37.12.png)

See merge request !4908
 2016-07-07 21:17:23 +00:00
Douwe Maan 29d574868a Display new diff notes and allow creation through the web interface 2016-07-06 18:51:00 -04:00
Luke "Jared" Bennett 50dfdf0296 fix up tests 
Added more exceptions

Added handling inline view type
 2016-07-06 08:29:57 +02:00
Jacob Schatz e065f4848b Diffs will create button/diff form on demand no on server side 2016-07-06 08:29:57 +02:00
Phil Hughes 5fcf475bc6 Updated tests 2016-07-05 09:06:38 +01:00
Grzegorz Bizon 9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Stan Hu 59fc1816d3 Rename Repo -> Repository 2016-06-21 07:54:02 -07:00
Stan Hu 26d2fa0aaa Rename Code tab to Repo 
Closes #18830
 2016-06-20 12:30:04 -07:00
Dmitriy Zaporozhets d4b2f5d0f3 Render only issues/mr in subnav depends on context 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-10 19:15:23 +03:00
Kamil Trzcinski 6e64d1ac76 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-07 10:26:27 +02: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 20c7144ed2 Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features 2016-06-03 16:22:26 +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
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 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
Phil Hughes 10e3de7a45 Fixed project settings tests 2016-05-20 08:49:31 +01: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
Douwe Maan c452fa8124 Update specs 2016-05-13 17:31:58 -05:00
Kamil Trzcinski 27e0c7723c Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 
# Conflicts:
#	db/schema.rb
 2016-04-19 14:00:14 -04:00
Phil Hughes ce2e37d446 Fixed tests 2016-04-16 16:13:16 -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
Annabel Dunstone 2f81baf476 Update click_diff_line 2016-04-14 09:10:40 -05:00
Yorick Peterse 31e28ebceb
Load related MRs/branches asynchronously 
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
 2016-04-13 17:24:21 +02:00
Kamil Trzcinski 89f0dc713c Fix rubocop 2016-04-12 12:33:04 +02:00
Kamil Trzcinski ac50f9dddf Fix rest of rspec and spinach tests 2016-04-12 10:23:31 +02:00
Kamil Trzcinski af7214d0f0 Fix specs 2016-04-11 23:32:55 +02:00
Annabel Dunstone dab4ac54b6 Diff design updates 2016-04-07 15:33:18 -07:00
Annabel Dunstone 87b3c73ea5 Update diff_comments tests 2016-04-07 15:33:18 -07: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 1f50833430 Updated tests 2016-04-04 10:48:49 +01:00
Phil Hughes ccc64676a9 Commits comment test update 2016-04-04 10:48:49 +01:00
Phil Hughes 29f414aa5a Tests update 2016-04-04 10:48:49 +01: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
Douwe Maan 6f50cef809 Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' 
Fixes "iid of max iid" in Issuable sidebar for merged MR


Fixes #13928.

See merge request !3046
 2016-03-15 15:17:08 +00:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild 
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
 2016-03-14 13:20:35 +01:00
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master' 
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
 2016-03-11 19:58:10 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master' 
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
 2016-03-11 13:07:43 +00:00
Dmitriy Zaporozhets e3efce9237
Move group activity feed to separate page for consistency with dashboard and project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-10 14:29:38 +01:00
Rémy Coutable e632bd26e4 Fixes "iid of max iid" in Issuable sidebar for merged MR 
Fixes #13928
 2016-03-08 16:23:20 +01:00
Robert Speicher 56c4f22c80 Remove redundant integration tests 
These three tests were essentially checking that adding a note to
something updated its `noteable`'s `updated_at` attribute.

This is well-tested Rails behavior and we shouldn't feel the need to
write an integration test to verify it. At most we should be ensuring
that the association definition adds the `touch: true` option, which we
now do in Note's unit test.
 2016-03-07 15:33:26 -05:00
Phil Hughes f95f242cfa Updated tests 2016-03-04 13:52:29 +00:00
Pierre de La Morinerie 543845f7ef Indicate how much an MR branch diverges from the target branch 2016-03-03 15:11:44 +01:00
Pierre de La Morinerie 566ea8543d Tests: extract a merge_request_path helper 2016-03-03 14:50:12 +01:00