summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-101-0/+2
* Fix Merge Conflicts app to make it work with Vue 2Alfredo Sumaran2016-11-104-27/+17
* Changed how lists get sortedPhil Hughes2016-11-103-2/+6
* Issue board spec fixesPhil Hughes2016-11-102-1/+3
* Fixed jump to discussion button not showingPhil Hughes2016-11-101-1/+5
* Changed how resolving notes is renderedPhil Hughes2016-11-104-35/+39
* Remove unnecesarry require.Fatih Acet2016-11-101-1/+0
* Fixed up resolve discussionsPhil Hughes2016-11-108-27/+43
* Refactor of issue boards to work with Vue2Phil Hughes2016-11-1016-234/+225
* VueJSMigration: Remove parallel-conflict-line component.Fatih Acet2016-11-103-20/+11
* Vue migration fix syntax highlighting.Fatih Acet2016-11-101-1/+1
* VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
* Migrate Vue v1 to v2.Fatih Acet2016-11-109-21/+23
* Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'mast...Douwe Maan2016-11-102-7/+9
|\
| * Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-usedGrzegorz Bizon2016-11-091-5/+1
| * Remove redundant space from repository model codeGrzegorz Bizon2016-11-091-1/+1
| * Evade some exceptions when using invalid referencesGrzegorz Bizon2016-11-071-1/+5
| * Improve code readability in pipelines controllerGrzegorz Bizon2016-11-071-1/+3
* | Merge branch 'fix-cache-for-commit-status' into 'master' Rémy Coutable2016-11-101-1/+1
|\ \
| * | Fix cache for commit status in commits list to respect branchesLin Jen-Shin2016-11-101-1/+1
* | | Use 'Forking in progress' title when appropriatePhilip Karpiak2016-11-091-1/+1
|/ /
* | Merge branch '22058-auto-selection' into 'master' Fatih Acet2016-11-091-0/+4
|\ \
| * | Fixes #22058 and #23578Yann Gravrand2016-11-061-0/+4
| |/
* | Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-094-25/+23
|\ \
| * | Remove an extra leading space from diff contentHiroyuki Sato2016-11-044-25/+23
* | | Merge branch 'pipeline-notifications' into 'master' Sean McGivern2016-11-0911-47/+80
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0862-228/+674
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0580-430/+546
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0418-170/+220
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-039-22/+26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-02336-833/+2220
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2588-291/+547
| |\ \ \ \ \ \ \ \
| * | | | | | | | | include PipelineQueue, feedback:Lin Jen-Shin2016-10-241-0/+1
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2470-187/+289
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Well pusher's privilege for read_build could be removedLin Jen-Shin2016-10-221-1/+3
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2128-105/+161
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Send only to users have :read_build access, feedback:Lin Jen-Shin2016-10-213-4/+13
| * | | | | | | | | | | Should send to notification_email instead, feedback:Lin Jen-Shin2016-10-201-1/+1
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-20129-582/+1514
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use bcc for pipeline emails because:Lin Jen-Shin2016-10-182-9/+12
| * | | | | | | | | | | | Use Array rather than compact, feedback:Lin Jen-Shin2016-10-181-1/+1
| * | | | | | | | | | | | Merge branch 'pipeline-emails' into pipeline-notificationsLin Jen-Shin2016-10-1841-671/+1150
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Skip if cannot find pipeline, feedback:Lin Jen-Shin2016-10-171-1/+3
| * | | | | | | | | | | | | Rename for a more consistent pipeline worker name, feedback:Lin Jen-Shin2016-10-173-3/+3
| * | | | | | | | | | | | | Use run_after_commit to avoid race condition, feedback:Lin Jen-Shin2016-10-171-1/+3
| * | | | | | | | | | | | | Pipeline#user could be nil. Feedback:Lin Jen-Shin2016-10-171-1/+1
| * | | | | | | | | | | | | Show it as successful pipeline, rather than success pipelineLin Jen-Shin2016-10-172-1/+10
| * | | | | | | | | | | | | It's already async, from Project#execute_services, feedback:Lin Jen-Shin2016-10-171-1/+1
| * | | | | | | | | | | | | Change service to be a worker, feedback:Lin Jen-Shin2016-10-174-17/+13
| * | | | | | | | | | | | | Prefix _ to show that it's intended unused, feedback:Lin Jen-Shin2016-10-171-1/+1