aff5c9f3e5
Add table for merge request commits
...
This is an ID-less table with just three columns: an association to the merge
request diff the commit belongs to, the relative order of the commit within the
merge request diff, and the commit SHA itself.
Previously we stored much more information about the commits, so that we could
display them even when they were deleted from the repo. Since 8.0, we ensure
that those commits are kept around for as long as the target repo itself is, so
we don't need to duplicate that data in the database.
2017-07-06 17:36:10 +01:00
8ce11fc388
Merge branch '12614-fix-long-message' into 'master'
...
Fix long urls in the title of commit
Closes #12614
See merge request !10938
2017-06-08 10:32:45 +00:00
204db05637
Re-enable Gitaly commit_raw_diffs migration
2017-06-07 16:55:45 +02:00
993412f9de
Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'
...
Use the new Gitaly CommitDiff RPC
See merge request !11826
2017-06-02 19:39:02 +00:00
3cdac884c7
Merge branch 'rc/enable-PreferredHashMethods-cop' into 'master'
...
Enable the Style/PreferredHashMethods cop
See merge request !11883
2017-06-02 19:00:28 +00:00
4cfa5ce4a9
Enable the Style/PreferredHashMethods cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-02 19:11:26 +02:00
857d039145
Lint our factories creation in addition to their build
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-02 19:06:50 +02:00
4d1e987ec3
Use the new Gitaly CommitDiff RPC
2017-06-02 18:33:18 +02:00
99feed6e00
Add support for deltas_only under Gitaly
...
Closes gitaly#199
2017-05-13 18:27:06 +02:00
fdba744986
Fix long urls in the title of commit
2017-05-12 11:45:26 +00:00
27fb64d6a3
Remove deltas_only from DiffCollection
2017-05-11 16:01:10 +02:00
d40e1f547e
Enable the Style/TrailingCommaInLiteral cop
...
Use the EnforcedStyleForMultiline: no_comma option.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10 18:25:45 +02:00
3107f2e460
Use Rails 'delegate'
2017-05-09 14:44:15 +02:00
f1a14d6857
Don't make Commit#raw_deltas private
2017-05-09 13:48:21 +02:00
48254d187f
Don't use DiffCollection for deltas
2017-05-09 12:27:17 +02:00
34cd109797
Re-enable Gitaly commit_raw_diff feature
2017-05-07 23:37:42 +02:00
0a29bde4a1
Rename latest_pipeline to last_pipeline
...
As it might be confusing that it's not the same as
Pipeline#latest
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11038#note_28677090
2017-05-03 01:40:49 +08:00
e69a7b95df
Always show latest pipeline info in commit box
2017-05-03 00:17:53 +08:00
7f625f06d3
Pass project to Blob
2017-04-27 12:23:26 -05:00
d6cc8feb6c
Setup and run a Gitaly server for testing if GitalyClient is enabled
2017-04-11 16:00:44 -03:00
08bbb9fce6
Add option to start a new discussion on an MR
2017-04-05 17:44:14 +01:00
5409a3c5b7
Merge branch 'feature/use-gitaly-for-commit-show' into 'master'
...
Use Gitaly for CommitController#show
See merge request !9629
2017-03-17 17:41:44 +00:00
ec970763e9
Adds pipeline mini-graph to system information box in Commit View
2017-03-16 00:44:31 +00:00
c0a4f527db
Use Gitaly for CommitController#show
2017-03-15 12:52:11 +02:00
bdbc7d967a
Revert "Enable Style/BarePercentLiterals"
...
This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
2017-02-23 09:32:42 -06:00
f74ca33a32
Enable Style/ClassCheck
2017-02-23 09:32:22 -06:00
5c7f9d69e3
Fix code for cops
2017-02-23 09:31:57 -06:00
8a4d68c53e
Enable Style/ConditionalAssignment
2017-02-23 09:31:57 -06:00
7ea641b6d0
Enable Style/ColonMethodCall
2017-02-23 09:31:57 -06:00
baafd8de26
Enable Style/BarePercentLiterals
2017-02-23 09:31:57 -06:00
b7d8df503c
Enable Style/MutableConstant
2017-02-23 09:31:56 -06:00
441501e4bf
Present TODO's list without grouping by project
2017-01-27 20:20:18 -02:00
dd3ddcd72b
Allows to search within project by commit's hash
...
Was proposed in #24833
2017-01-24 14:56:00 +03:00
e59623e738
Mark MR as WIP when pushing WIP commits
2017-01-19 12:30:34 +01:00
632d22acf7
Mark Commit persisted
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-16 23:28:44 -05:00
112f470572
Fix cross-project references copy to include the project reference
...
Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
2017-01-03 13:01:46 +01:00
7cced60069
Introduce latest_status and add a few tests
...
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20003268
2016-12-14 23:37:49 +08:00
367024f170
Merge remote-tracking branch 'upstream/master' into show-commit-status-from-latest-pipeline
...
* upstream/master: (557 commits)
Fix wrong error message expectation in API::Commits spec
Move admin settings spinach feature to rspec
Encode when migrating ProcessCommitWorker jobs
Prevent overflow with vertical scroll when we have space to show content
Make rubocop happy
API: Ability to cherry-pick a commit
Be smarter when finding a sudoed user in API::Helpers
Backport hooks on group policies for the EE-specific implementation
API: Ability to get group's project in simple representation
Add AddLowerPathIndexToRoutes to setup_postgresql.rake
For single line git commit messages, the close quote should be on the same line as the open quote
added border-radius and padding to labels
Allow all alphanumeric characters in file names (!8002 )
Add failing test for #20190
Don't allow blank MR titles in API
Replace static fixture for awards_handler_spec (!7661 )
Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)
Fix test
Tweak style and add back wording
Clean up commit copy to clipboard and make consistent
...
2016-12-14 19:24:31 +08:00
f23b1cb453
Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'
...
Replace MR access checks with use of MergeRequestsFinder
Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867
⚠️ - Potentially untested
💣 - No test coverage
🚥 - Test coverage of some sort exists (a test failed when error raised)
🚦 - Test coverage of return value (a test failed when nil used)
✅ - Permissions check tested
- [x] 💣 app/finders/notes_finder.rb:17
- [x] ⚠️ app/views/layouts/nav/_project.html.haml:80 [`.count`]
- [x] 💣 app/controllers/concerns/creates_commit.rb:84
- [x] 🚥 app/controllers/projects/commits_controller.rb:24
- [x] 🚥 app/controllers/projects/compare_controller.rb:56
- [x] 🚦 app/controllers/projects/discussions_controller.rb:29
- [x] ✅ app/controllers/projects/todos_controller.rb:27
- [x] 🚦 app/models/commit.rb:268
- [x] ✅ lib/gitlab/search_results.rb:71
- [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)`
- [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`.
- [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?`
See merge request !2033
2016-12-08 21:42:07 -03:00
f272ee6eba
Add shorthand support to gitlab markdown references
2016-12-02 19:18:17 -02:00
6b4d33566f
Pass commit data to ProcessCommitWorker
...
By passing commit data to this worker we remove the need for querying
the Git repository for every job. This in turn reduces the time spent
processing each job.
The migration included migrates jobs from the old format to the new
format. For this to work properly it requires downtime as otherwise
workers may start producing errors until they're using a newer version
of the worker code.
2016-12-01 13:36:06 +01:00
6192ea53fa
Rename latest_for to latest, feedback:
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333/diffs#note_18819292
2016-11-24 16:50:37 +08:00
721f2d3788
Still use compound pipeline status, but group by
...
ref and sha so that it would show latest pipeline
if ref and sha are both specified, otherwise still
the same as before.
2016-11-21 22:19:16 +08:00
18a71c4760
Show commit status from latest pipeline
...
Rather than compound status from all pipelines.
Closes #20560
2016-11-08 00:04:18 +08:00
0902ba524f
Initialize @statuses in status rather than constructor
...
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17742312
2016-11-03 23:43:17 +08:00
1ae557c106
Merge status_for and status, feedback:
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17742297
2016-11-03 23:39:37 +08:00
f4b9de38ed
It's not used as a public API right now, feedback:
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17522443
2016-10-28 03:12:12 +08:00
b4ef158a63
Still show status from pipelines, see:
...
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397201
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17397461
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6801#note_17468470
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7034#note_17482654
2016-10-27 00:58:40 +08:00
5416d0e083
Pass `@ref` along so we know which pipeline to show
...
Closes #23615
2016-10-24 22:26:06 +08:00
0d8352973b
Use JavaScript tooltips for mentions ( !5301 )
2016-09-01 01:21:34 +02:00
Sean McGivern
Dmitriy Zaporozhets
Ahmad Sherif
Robert Speicher
Rémy Coutable
Alexander Randa
Jacob Vosmaer
Lin Jen-Shin
Douwe Maan
Alejandro Rodríguez
Filipa Lacerda
Oswaldo Ferreira
YarNayar
jurre
P.S.V.R
James Lopez
Douwe Maan
Oswaldo Ferreira
Yorick Peterse
winniehell