summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* prevent empty <tr>psimyn-diff-discussion-vue-storybookSimon Knox2017-12-192-2/+3
* fix mock data shapeSimon Knox2017-12-193-20/+22
* fix sb diff renderSimon Knox2017-12-191-2/+4
* Revert "Stop sending milestone and labels data over the wire for MR widget"Simon Knox2017-12-1915-68/+99
* fix bad resolutionSimon Knox2017-12-191-9/+0
* Merge remote-tracking branch 'origin/acet-mr-notes-index' into psimyn-diff-di...Simon Knox2017-12-19403-2655/+5210
|\
| * MRNotesRefactor: Unify discussion resolve logic.Fatih Acet2017-12-194-31/+33
| * MRNotesRefactor: Discussions resolving by thread.Fatih Acet2017-12-1812-58/+130
| * MRNotesRefactor: Implement resolvability per note.Fatih Acet2017-12-188-28/+66
| * MRNotesRefactor: Implement initial version of note resolve.Fatih Acet2017-12-184-3/+31
| * MRNotesRefactor: Add resolve button into note form.Fatih Acet2017-12-181-0/+10
| * MRNotesRefactor: Add resolve button to noteable discussion.Fatih Acet2017-12-181-8/+67
| * MRNotesRefactor: Fix noteable type confusion.Fatih Acet2017-12-183-3/+18
| * MRNotesRefactor: Fix references for notes_app.Fatih Acet2017-12-181-3/+3
| * MRNotesRefactor: Add resolve buttons to note actions.Fatih Acet2017-12-181-0/+37
| * MRNotesRefactor: Add mising create_note_path to MR entity.Fatih Acet2017-12-181-0/+4
| * MRDiscussionsRefactor: Fix GFM autocomplete endpoints.Fatih Acet2017-12-181-0/+1
| * Code styling improvements.Fatih Acet2017-12-182-11/+10
| * make editMessage work FE - add noteableTypeSimon Knox2017-12-184-17/+32
| * backend changes to allow editing notesSimon Knox2017-12-182-0/+9
| * MRNotesRefactor: Fix adding award emoji from emoji dropdown.Fatih Acet2017-12-183-8/+16
| * MRNotesRefactor: Render MR Notes with Vue with a cookie behind.Fatih Acet2017-12-188-5/+82
| * Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'41248-datetime_utility-calls-a-missing-lang-export-function-from-locale-index-js⛄️ Sean McGivern ⛄️2017-12-182-7/+22
| |\
| | * rework the merge_request_version_params to use Object#tapcommit-diff-discussion-in-mr-context-fix-linksMicaël Bergeron2017-12-181-8/+4
| | * fix the commit diff discussion sending the wrong urlMicaël Bergeron2017-12-182-7/+26
| * | Merge branch 'use-queue_namespace' into 'master'Stan Hu2017-12-182-1/+2
| |\ \
| | * | Add pipeline_creation:run_pipeline_schedule into Sidekiq queue listuse-queue_namespaceStan Hu2017-12-181-0/+1
| | * | Use queue_namespace rather than enqueue_inLin Jen-Shin2017-12-181-1/+1
| | |/
| * | Merge branch 'ph-es-notes-module' into 'master'Filipa Lacerda2017-12-188-24/+25
| |\ \
| | * \ Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-modulePhil Hughes2017-12-18252-903/+1709
| | |\ \
| | * | | Export and use Notes ES modulePhil Hughes2017-12-158-24/+25
| * | | | Merge branch '41117-empty-state' into 'master'Phil Hughes2017-12-182-497/+522
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Only render signout screen when user is signed outFilipa Lacerda2017-12-182-497/+522
| |/ / /
| * | | Merge branch '40871-todo-notification-count-shows-notification-without-having...Douwe Maan2017-12-1810-18/+73
| |\ \ \
| | * | | Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-1810-18/+73
| * | | | Merge branch '39298-list-of-avatars-2' into 'master'Rémy Coutable2017-12-182-11/+12
| |\ \ \ \
| | * | | | List of avatars should never show +1Jacopo2017-12-182-11/+12
| * | | | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-1815-12/+371
| |\ \ \ \ \
| | * | | | | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-nowStan Hu2017-12-124-21/+53
| | * | | | | Fix Rubocop offense and use a symbol instead of a stringStan Hu2017-12-122-2/+2
| | * | | | | Add spec for ActionRateLimiterStan Hu2017-12-122-2/+29
| | * | | | | Add a spec for rate limiting pipeline schedulesStan Hu2017-12-122-2/+12
| | * | | | | Add rate limiting to guard against excessive scheduling of pipelinesStan Hu2017-12-123-1/+43
| | * | | | | Avoid Gitaly N+1 calls by caching tag_namesStan Hu2017-12-123-0/+17
| | * | | | | Fix Sidekiq worker and make flash message return a link to the pipelines pageStan Hu2017-12-123-3/+3
| | * | | | | Refactor common protected ref checkStan Hu2017-12-123-16/+102
| | * | | | | Fix conditions for checking pipeline schedule rulesStan Hu2017-12-122-4/+4
| | * | | | | Create a play_pipeline_schedule policy and use itStan Hu2017-12-124-7/+40
| | * | | | | Address some comments with running a pipeline scheduleStan Hu2017-12-126-16/+21
| | * | | | | Add button to run scheduled pipeline immediatelyStan Hu2017-12-128-3/+110